This is a note to let you know that I've just added the patch titled
media: em28xx: fix VBI handling logic
to the 3.16-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
media-em28xx-fix-vbi-handling-logic.patch
and it can be found in the queue-3.16 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From c7854c2c5d692a329b4d9a9a73bcf36ae137ee7c Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx>
Date: Fri, 19 Sep 2014 13:02:12 -0300
Subject: media: em28xx: fix VBI handling logic
From: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx>
commit c7854c2c5d692a329b4d9a9a73bcf36ae137ee7c upstream.
When both VBI and video are streaming, and video stream is stopped,
a subsequent trial to restart it will fail, because S_FMT will
return -EBUSY.
That prevents applications like zvbi to work properly.
Please notice that, while this fix it fully for zvbi, the
best is to get rid of streaming_users and res_get logic as a hole.
However, this single-line patch is better to be merged at -stable.
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/media/usb/em28xx/em28xx-video.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/media/usb/em28xx/em28xx-video.c
+++ b/drivers/media/usb/em28xx/em28xx-video.c
@@ -1344,7 +1344,7 @@ static int vidioc_s_fmt_vid_cap(struct f
struct em28xx *dev = video_drvdata(file);
struct em28xx_v4l2 *v4l2 = dev->v4l2;
- if (v4l2->streaming_users > 0)
+ if (vb2_is_busy(&v4l2->vb_vidq))
return -EBUSY;
vidioc_try_fmt_vid_cap(file, priv, f);
Patches currently in stable-queue which might be from mchehab@xxxxxxxxxxxxxxx are
queue-3.16/media-vb2-fix-vb2-state-check-when-start_streaming-fails.patch
queue-3.16/media-videobuf2-dma-sg-fix-for-wrong-gfp-mask-to-sg_alloc_table_from_pages.patch
queue-3.16/media-adv7604-fix-inverted-condition.patch
queue-3.16/media-vb2-fix-plane-index-sanity-check-in-vb2_plane_cookie.patch
queue-3.16/media-em28xx-fix-vbi-handling-logic.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html