leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

V4L/DVB: gspca - main: Check the file doing stream on/off

Browse Source 
Signed-off-by: Jean-François Moine <moinejf@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Jean-François Moine 2010-04-09 06:06:11 -03:00 committed by Mauro Carvalho Chehab
parent 0b62b73778
commit 18bf99aa0c
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/media/video/gspca/gspca.c
View File

@ -1590,6 +1590,12 @@ static int vidioc_streamon(struct file *file, void *priv,
if (mutex_lock_interruptible(&gspca_dev->queue_lock)) if (mutex_lock_interruptible(&gspca_dev->queue_lock))
return -ERESTARTSYS; return -ERESTARTSYS;
/* check the capture file */
if (gspca_dev->capt_file != file) {
ret = -EBUSY;
goto out;
}
if (gspca_dev->nframes == 0 if (gspca_dev->nframes == 0
|| !(gspca_dev->frame[0].v4l2_buf.flags & V4L2_BUF_FLAG_QUEUED)) { || !(gspca_dev->frame[0].v4l2_buf.flags & V4L2_BUF_FLAG_QUEUED)) {
ret = -EINVAL; ret = -EINVAL;
@ -1627,6 +1633,12 @@ static int vidioc_streamoff(struct file *file, void *priv,
if (mutex_lock_interruptible(&gspca_dev->queue_lock)) if (mutex_lock_interruptible(&gspca_dev->queue_lock))
return -ERESTARTSYS; return -ERESTARTSYS;
/* check the capture file */
if (gspca_dev->capt_file != file) {
ret = -EBUSY;
goto out;
}
/* stop streaming */ /* stop streaming */
if (mutex_lock_interruptible(&gspca_dev->usb_lock)) { if (mutex_lock_interruptible(&gspca_dev->usb_lock)) {
ret = -ERESTARTSYS; ret = -ERESTARTSYS;