diff options
author | Florian Fainelli <florian@openwrt.org> | 2014-09-27 19:10:51 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2014-09-27 19:10:51 +0000 |
commit | 6918ea2484861cbf806c812b95a814ab40063c05 (patch) | |
tree | 3f4d53baabebad9339cadd1bbfaaf07ed61b9c1e /target/linux/brcm2708/patches-3.10/0138-V4L2-Fix-information-advertised-through-g_vidfmt.patch | |
parent | ff6b0d57b8e4dd9c72b13ac0586c523c8d6e8841 (diff) | |
download | master-31e0f0ae-6918ea2484861cbf806c812b95a814ab40063c05.tar.gz master-31e0f0ae-6918ea2484861cbf806c812b95a814ab40063c05.tar.bz2 master-31e0f0ae-6918ea2484861cbf806c812b95a814ab40063c05.zip |
brcm2708: update 3.10 patches with raspberrypi/rpi-3.10.y of 27 Apr. 2014
Update the 3.10 rasperry patches by rebasing raspberry/rpi-3.10-y
against linux-stable/v3.10.49.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 42678
Diffstat (limited to 'target/linux/brcm2708/patches-3.10/0138-V4L2-Fix-information-advertised-through-g_vidfmt.patch')
-rw-r--r-- | target/linux/brcm2708/patches-3.10/0138-V4L2-Fix-information-advertised-through-g_vidfmt.patch | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/target/linux/brcm2708/patches-3.10/0138-V4L2-Fix-information-advertised-through-g_vidfmt.patch b/target/linux/brcm2708/patches-3.10/0138-V4L2-Fix-information-advertised-through-g_vidfmt.patch index 984bfa3c7b..ec936665cd 100644 --- a/target/linux/brcm2708/patches-3.10/0138-V4L2-Fix-information-advertised-through-g_vidfmt.patch +++ b/target/linux/brcm2708/patches-3.10/0138-V4L2-Fix-information-advertised-through-g_vidfmt.patch @@ -1,7 +1,7 @@ -From afd8800a96b940049ac37fb90cc24deeeea5c57e Mon Sep 17 00:00:00 2001 +From e583299dcd36a6e23a8479d8597a85b6c9e6cbbb Mon Sep 17 00:00:00 2001 From: Dave Stevenson <dsteve@broadcom.com> Date: Mon, 9 Dec 2013 17:29:39 +0000 -Subject: [PATCH 138/174] V4L2: Fix information advertised through g_vidfmt +Subject: [PATCH 138/196] V4L2: Fix information advertised through g_vidfmt Width and height were being stored based on incorrect values. @@ -11,9 +11,11 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com> drivers/media/platform/bcm2835/bcm2835-camera.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) +diff --git a/drivers/media/platform/bcm2835/bcm2835-camera.c b/drivers/media/platform/bcm2835/bcm2835-camera.c +index c8d8742..4766a9c 100644 --- a/drivers/media/platform/bcm2835/bcm2835-camera.c +++ b/drivers/media/platform/bcm2835/bcm2835-camera.c -@@ -1028,13 +1028,19 @@ static int mmal_setup_components(struct +@@ -1028,13 +1028,19 @@ static int mmal_setup_components(struct bm2835_mmal_dev *dev, if (!ret) { dev->capture.fmt = mfmt; dev->capture.stride = f->fmt.pix.bytesperline; @@ -35,3 +37,6 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com> } } +-- +1.9.1 + |