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 | c65ec1aa8fbcbafdc568c4206286ca77f3234caf (patch) | |
| tree | 563323b952b96b10d5cca5b124de2cd9266259b0 /target/linux/brcm2708/patches-3.10/0152-V4L2-Increase-the-MMAL-timeout-to-3sec.patch | |
| parent | 7771ecddf3b18914aa513ef818042516f61e79a9 (diff) | |
| download | master-187ad058-c65ec1aa8fbcbafdc568c4206286ca77f3234caf.tar.gz master-187ad058-c65ec1aa8fbcbafdc568c4206286ca77f3234caf.tar.bz2 master-187ad058-c65ec1aa8fbcbafdc568c4206286ca77f3234caf.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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42678 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm2708/patches-3.10/0152-V4L2-Increase-the-MMAL-timeout-to-3sec.patch')
| -rw-r--r-- | target/linux/brcm2708/patches-3.10/0152-V4L2-Increase-the-MMAL-timeout-to-3sec.patch | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/target/linux/brcm2708/patches-3.10/0152-V4L2-Increase-the-MMAL-timeout-to-3sec.patch b/target/linux/brcm2708/patches-3.10/0152-V4L2-Increase-the-MMAL-timeout-to-3sec.patch index 6588a6a764..a4a4dec7cd 100644 --- a/target/linux/brcm2708/patches-3.10/0152-V4L2-Increase-the-MMAL-timeout-to-3sec.patch +++ b/target/linux/brcm2708/patches-3.10/0152-V4L2-Increase-the-MMAL-timeout-to-3sec.patch @@ -1,7 +1,7 @@ -From 5ea012c31815b53d6f49ce0679750108657b8a63 Mon Sep 17 00:00:00 2001 +From e2da876177f951c0010181d441fd41536109b71e Mon Sep 17 00:00:00 2001 From: Dave Stevenson <dsteve@broadcom.com> Date: Tue, 7 Jan 2014 12:36:07 +0000 -Subject: [PATCH 152/174] V4L2: Increase the MMAL timeout to 3sec +Subject: [PATCH 152/196] V4L2: Increase the MMAL timeout to 3sec MJPEG codec flush is now taking longer and results in a kernel panic if the driver has stopped waiting for @@ -13,9 +13,11 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com> drivers/media/platform/bcm2835/mmal-vchiq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/drivers/media/platform/bcm2835/mmal-vchiq.c b/drivers/media/platform/bcm2835/mmal-vchiq.c +index a06fb44..67d1ce6 100644 --- a/drivers/media/platform/bcm2835/mmal-vchiq.c +++ b/drivers/media/platform/bcm2835/mmal-vchiq.c -@@ -742,7 +742,7 @@ static int send_synchronous_mmal_msg(str +@@ -742,7 +742,7 @@ static int send_synchronous_mmal_msg(struct vchiq_mmal_instance *instance, return ret; } @@ -24,3 +26,6 @@ Signed-off-by: Dave Stevenson <dsteve@broadcom.com> if (ret <= 0) { pr_err("error %d waiting for sync completion\n", ret); if (ret == 0) +-- +1.9.1 + |