brcm2708: update 3.10 patches with raspberrypi/rpi-3.10.y of 27 Apr. 2014

[openwrt.git] / target / linux / brcm2708 / patches-3.10 / 0133-V4L2-Fix-issue-of-driver-jamming-if-STREAMON-failed.patch

diff --git a/target/linux/brcm2708/patches-3.10/0133-V4L2-Fix-issue-of-driver-jamming-if-STREAMON-failed.patch b/target/linux/brcm2708/patches-3.10/0133-V4L2-Fix-issue-of-driver-jamming-if-STREAMON-failed.patch
index 6f2819c..93cab30 100644 (file)
--- a/target/linux/brcm2708/patches-3.10/0133-V4L2-Fix-issue-of-driver-jamming-if-STREAMON-failed.patch
+++ b/target/linux/brcm2708/patches-3.10/0133-V4L2-Fix-issue-of-driver-jamming-if-STREAMON-failed.patch
@@ -1,7 +1,7 @@
-From a29f4da13057535935fb2b390b01b46b4a4d133b Mon Sep 17 00:00:00 2001
+From 3e5851305b45a4dac66bd49529e511d1334a08fc Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dsteve@broadcom.com>
 Date: Mon, 9 Dec 2013 11:05:24 +0000
-Subject: [PATCH 133/174] V4L2: Fix issue of driver jamming if STREAMON failed.
+Subject: [PATCH 133/196] V4L2: Fix issue of driver jamming if STREAMON failed.
 
 Fix issue where the driver was left in a partially enabled
 state if STREAMON failed, and would then reject many IOCTLs
@@ -12,9 +12,11 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
  drivers/media/platform/bcm2835/bcm2835-camera.c | 10 +++++++++-
  1 file changed, 9 insertions(+), 1 deletion(-)
 
+diff --git a/drivers/media/platform/bcm2835/bcm2835-camera.c b/drivers/media/platform/bcm2835/bcm2835-camera.c
+index 47fe45d..2743074 100644
 --- a/drivers/media/platform/bcm2835/bcm2835-camera.c
 +++ b/drivers/media/platform/bcm2835/bcm2835-camera.c
-@@ -425,7 +425,15 @@ static int start_streaming(struct vb2_qu
+@@ -425,7 +425,15 @@ static int start_streaming(struct vb2_queue *vq, unsigned int count)
            vchiq_mmal_port_enable(dev->instance, dev->capture.port, buffer_cb);
        if (ret) {
                v4l2_err(&dev->v4l2_dev,
@@ -31,3 +33,6 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
                return -1;
        }
  
+-- 
+1.9.1
+