diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2012-05-22 11:24:05 -0300 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-07-04 05:44:14 +0100 |
| commit | 2b1e0f0a1618b62738eb86eb67eecbdebd491a0c (patch) | |
| tree | 6c6cbbc59e8b53db6fbe9139ba9ffd87147ef7e0 /drivers/media/video/gspca | |
| parent | c4a08668a15a03370b3ba7cae49d1017f2c8434d (diff) | |
| download | kernel_samsung_smdk4412-2b1e0f0a1618b62738eb86eb67eecbdebd491a0c.zip kernel_samsung_smdk4412-2b1e0f0a1618b62738eb86eb67eecbdebd491a0c.tar.gz kernel_samsung_smdk4412-2b1e0f0a1618b62738eb86eb67eecbdebd491a0c.tar.bz2 | |
gspca-core: Fix buffers staying in queued state after a stream_off
commit af05ef01e9cde84620c6855a8d8ab9c8a1db9009 upstream.
This fixes a regression introduced by commit f7059ea and should be
backported to all supported stable kernels which have this commit.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Tested-by: Antonio Ospite <ospite@studenti.unina.it>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/media/video/gspca')
| -rw-r--r-- | drivers/media/video/gspca/gspca.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index 2ca10df..981501f 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c @@ -1697,7 +1697,7 @@ static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type buf_type) { struct gspca_dev *gspca_dev = priv; - int ret; + int i, ret; if (buf_type != V4L2_BUF_TYPE_VIDEO_CAPTURE) return -EINVAL; @@ -1728,6 +1728,8 @@ static int vidioc_streamoff(struct file *file, void *priv, wake_up_interruptible(&gspca_dev->wq); /* empty the transfer queues */ + for (i = 0; i < gspca_dev->nframes; i++) + gspca_dev->frame[i].v4l2_buf.flags &= ~BUF_ALL_FLAGS; atomic_set(&gspca_dev->fr_q, 0); atomic_set(&gspca_dev->fr_i, 0); gspca_dev->fr_o = 0; |