V4L2: Increase the MMAL timeout to 3sec

Dave Stevenson · popcornmix · commit e083ef78b5c5 · 2014-01-07T13:05:05.000Z
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 &lt;dsteve@broadcom.com&gt;
diff --git 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)

Original file line number	Diff line number	Diff line change
`@@ -742,7 +742,7 @@ static int send_synchronous_mmal_msg(struct vchiq_mmal_instance *instance,`
`742`	`742`	`return ret;`
`743`	`743`	`}`
`744`	`744`
`745`		`- ret = wait_for_completion_timeout(&msg_context.u.sync.cmplt, HZ);`
	`745`	`+ ret = wait_for_completion_timeout(&msg_context.u.sync.cmplt, 3*HZ);`
`746`	`746`	`if (ret <= 0) {`
`747`	`747`	`pr_err("error %d waiting for sync completion\n", ret);`
`748`	`748`	`if (ret == 0)`