On Tue, 03 Jul 2012 09:36:59 -0700
<[email protected]> wrote:

> 
> The patch below does not apply to the 3.4-stable tree.
> If someone wants it applied there, or to any other stable or longterm
> tree, then please email the backport, including the original git commit
> id to <[email protected]>.
> 
> thanks,
> 
> greg k-h
>

I'll do it for 3.4

> ------------------ original commit in Linus's tree ------------------
> 
> From af05ef01e9cde84620c6855a8d8ab9c8a1db9009 Mon Sep 17 00:00:00 2001
> From: Hans de Goede <[email protected]>
> Date: Tue, 22 May 2012 11:24:05 -0300
> Subject: [PATCH] [media] gspca-core: Fix buffers staying in queued state
>  after a stream_off
> 
> 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 <[email protected]>
> Tested-by: Antonio Ospite <[email protected]>
> CC: [email protected]
> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
> 
> 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;
> 
> 


-- 
Antonio Ospite
http://ao2.it

A: Because it messes up the order in which people normally read text.
   See http://en.wikipedia.org/wiki/Posting_style
Q: Why is top-posting such a bad thing?
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to