Re: [PATCH] gspca-core: Fix buffers staying in queued state after a stream_off
From: Hans de Goede <hidden>
Date: 2012-05-23 08:21:40
sorry for the spam, I had to resend it because I got the stable email address wrong. On 05/23/2012 10:20 AM, Hans de Goede wrote:
quoted hunk ↗ jump to hunk
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<redacted> Tested-by: Antonio Ospite<redacted> CC: stable@vger.kernel.org --- drivers/media/video/gspca/gspca.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c index 137166d..31721ea 100644 --- a/drivers/media/video/gspca/gspca.c +++ b/drivers/media/video/gspca/gspca.c@@ -1653,7 +1653,7 @@ static int vidioc_streamoff(struct file *file, void *priv, enum v4l2_buf_type buf_type) { struct gspca_dev *gspca_dev = video_drvdata(file); - int ret; + int i, ret; if (buf_type != V4L2_BUF_TYPE_VIDEO_CAPTURE) return -EINVAL;@@ -1678,6 +1678,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;