aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2014-08-29 04:45:59 -0400
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2014-11-03 05:30:26 -0500
commitb8f884164bdfbcecf61e891b52d8a03fec9ed461 (patch)
tree1ea71775ee77683cc78cfa8c851b9ea86f95f5bd
parent5e7045e3fa4976a37c6bbf337729ea47d0c886d0 (diff)
[media] cx88: increase API command timeout
The timeout is way too small. Especially complicated command like CX2341X_ENC_STOP_CAPTURE takes much more time than 10 ms. Increase the timeout to 1 second, just as ivtv does (the cx88-blackbird has the same IP core for MPEG compression as ivtv). This solves a nasty issue where STOP_CAPTURE would timeout and the mailbox is left in a busy state, making it impossible to start streaming a second time without reloading the driver first. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
-rw-r--r--drivers/media/pci/cx88/cx88-blackbird.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/pci/cx88/cx88-blackbird.c b/drivers/media/pci/cx88/cx88-blackbird.c
index f27a3f134025..32fb9355c9f6 100644
--- a/drivers/media/pci/cx88/cx88-blackbird.c
+++ b/drivers/media/pci/cx88/cx88-blackbird.c
@@ -348,7 +348,7 @@ static int blackbird_mbox_func(void *priv, u32 command, int in, int out, u32 dat
348 memory_write(dev->core, dev->mailbox, flag); 348 memory_write(dev->core, dev->mailbox, flag);
349 349
350 /* wait for firmware to handle the API command */ 350 /* wait for firmware to handle the API command */
351 timeout = jiffies + msecs_to_jiffies(10); 351 timeout = jiffies + msecs_to_jiffies(1000);
352 for (;;) { 352 for (;;) {
353 memory_read(dev->core, dev->mailbox, &flag); 353 memory_read(dev->core, dev->mailbox, &flag);
354 if (0 != (flag & 4)) 354 if (0 != (flag & 4))