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

[openwrt.git] / target / linux / brcm2708 / patches-3.10 / 0134-V4L2-Fix-ISO-controls.patch

diff --git a/target/linux/brcm2708/patches-3.10/0134-V4L2-Fix-ISO-controls.patch b/target/linux/brcm2708/patches-3.10/0134-V4L2-Fix-ISO-controls.patch
index 75883df..3f6c91c 100644 (file)
--- a/target/linux/brcm2708/patches-3.10/0134-V4L2-Fix-ISO-controls.patch
+++ b/target/linux/brcm2708/patches-3.10/0134-V4L2-Fix-ISO-controls.patch
@@ -1,7 +1,7 @@
-From d9dc4b7760b20885d5bd1d17fd6dce818f1141e0 Mon Sep 17 00:00:00 2001
+From e4dc7a4bf88ca8e70f604b5d26335911073e5238 Mon Sep 17 00:00:00 2001
 From: Dave Stevenson <dsteve@broadcom.com>
 Date: Mon, 9 Dec 2013 15:30:48 +0000
-Subject: [PATCH 134/174] V4L2: Fix ISO controls.
+Subject: [PATCH 134/196] V4L2: Fix ISO controls.
 
 Driver was passing the index to the GPU, and not the desired
 ISO value.
@@ -11,9 +11,11 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
  drivers/media/platform/bcm2835/controls.c | 21 ++++++++++++++++++++-
  1 file changed, 20 insertions(+), 1 deletion(-)
 
+diff --git a/drivers/media/platform/bcm2835/controls.c b/drivers/media/platform/bcm2835/controls.c
+index c2e4c64..92863f7 100644
 --- a/drivers/media/platform/bcm2835/controls.c
 +++ b/drivers/media/platform/bcm2835/controls.c
-@@ -178,6 +178,25 @@ static int ctrl_set_value(struct bm2835_
+@@ -178,6 +178,25 @@ static int ctrl_set_value(struct bm2835_mmal_dev *dev,
                                             &u32_value, sizeof(u32_value));
  }
  
@@ -39,7 +41,7 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
  static int ctrl_set_value_ev(struct bm2835_mmal_dev *dev,
                      struct v4l2_ctrl *ctrl,
                      const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl)
-@@ -601,7 +620,7 @@ static const struct bm2835_mmal_v4l2_ctr
+@@ -601,7 +620,7 @@ static const struct bm2835_mmal_v4l2_ctrl v4l2_ctrls[V4L2_CTRL_COUNT] = {
        {
                V4L2_CID_ISO_SENSITIVITY, MMAL_CONTROL_TYPE_INT_MENU,
                0, ARRAY_SIZE(iso_qmenu) - 1, 0, 1, iso_qmenu,
@@ -48,3 +50,6 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
        },
        {
                V4L2_CID_IMAGE_STABILIZATION, MMAL_CONTROL_TYPE_STD,
+-- 
+1.9.1
+