brcm2708: update against latest rpi-3.10.y branch
[openwrt/staging/florian.git] / target / linux / brcm2708 / patches-3.10 / 0152-V4L2-Increase-the-MMAL-timeout-to-3sec.patch
1 From 5ea012c31815b53d6f49ce0679750108657b8a63 Mon Sep 17 00:00:00 2001
2 From: Dave Stevenson <dsteve@broadcom.com>
3 Date: Tue, 7 Jan 2014 12:36:07 +0000
4 Subject: [PATCH 152/174] V4L2: Increase the MMAL timeout to 3sec
5
6 MJPEG codec flush is now taking longer and results
7 in a kernel panic if the driver has stopped waiting for
8 the result when it finally completes.
9 Increase the timeout value from 1 to 3secs.
10
11 Signed-off-by: Dave Stevenson <dsteve@broadcom.com>
12 ---
13 drivers/media/platform/bcm2835/mmal-vchiq.c | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16 --- a/drivers/media/platform/bcm2835/mmal-vchiq.c
17 +++ b/drivers/media/platform/bcm2835/mmal-vchiq.c
18 @@ -742,7 +742,7 @@ static int send_synchronous_mmal_msg(str
19 return ret;
20 }
21
22 - ret = wait_for_completion_timeout(&msg_context.u.sync.cmplt, HZ);
23 + ret = wait_for_completion_timeout(&msg_context.u.sync.cmplt, 3*HZ);
24 if (ret <= 0) {
25 pr_err("error %d waiting for sync completion\n", ret);
26 if (ret == 0)