hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[media] s2255drv: fix for return code not checked 

Start acquisition return code was not being checked.  Return error
if start acquisition fails.

Signed-off-by: Dean Anderson <linux-dev@sensoray.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
This commit is contained in:
Dean Anderson 2014-02-05 15:58:20 -03:00 committed by Mauro Carvalho Chehab
parent 47d8c881c3
commit 6a5b63b3cb
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/media/usb/s2255/s2255drv.c
View File

@ -1230,12 +1230,16 @@ static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type i)
vc->buffer.frame[j].cur_size = 0; vc->buffer.frame[j].cur_size = 0;
} }
res = videobuf_streamon(&fh->vb_vidq); res = videobuf_streamon(&fh->vb_vidq);
if (res == 0) { if (res != 0) {
s2255_start_acquire(vc);
vc->b_acquire = 1;
} else
res_free(fh); res_free(fh);
return res;
}
res = s2255_start_acquire(vc);
if (res != 0) {
res_free(fh);
return res;
}
vc->b_acquire = 1;
return res; return res;
} }
@ -2373,7 +2377,7 @@ static int s2255_start_acquire(struct s2255_vc *vc)
dprintk(dev, 2, "start acquire exit[%d] %d\n", vc->idx, res); dprintk(dev, 2, "start acquire exit[%d] %d\n", vc->idx, res);
mutex_unlock(&dev->cmdlock); mutex_unlock(&dev->cmdlock);
return 0; return res;
} }
static int s2255_stop_acquire(struct s2255_vc *vc) static int s2255_stop_acquire(struct s2255_vc *vc)