Commit 18bf99aa authored by Jean-François Moine's avatar Jean-François Moine Committed by Mauro Carvalho Chehab

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

Signed-off-by: default avatarJean-François Moine <moinejf@free.fr>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 0b62b737
...@@ -1590,6 +1590,12 @@ static int vidioc_streamon(struct file *file, void *priv, ...@@ -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, ...@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment