mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 14:37:57 +00:00
6918ea2484
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
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
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/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
|
|
the result when it finally completes.
|
|
Increase the timeout value from 1 to 3secs.
|
|
|
|
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(struct vchiq_mmal_instance *instance,
|
|
return ret;
|
|
}
|
|
|
|
- ret = wait_for_completion_timeout(&msg_context.u.sync.cmplt, HZ);
|
|
+ ret = wait_for_completion_timeout(&msg_context.u.sync.cmplt, 3*HZ);
|
|
if (ret <= 0) {
|
|
pr_err("error %d waiting for sync completion\n", ret);
|
|
if (ret == 0)
|
|
--
|
|
1.9.1
|
|
|