V4L/DVB (12936): SAA7164: Added waitsecs module parameter
Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
diff --git a/drivers/media/video/saa7164/saa7164-cmd.c b/drivers/media/video/saa7164/saa7164-cmd.c
index 0c3585b..171ef11 100644
--- a/drivers/media/video/saa7164/saa7164-cmd.c
+++ b/drivers/media/video/saa7164/saa7164-cmd.c
@@ -234,8 +234,8 @@
__func__, seqno, dev->cmds[seqno].signalled);
/* Wait for signalled to be flagged or timeout */
- wait_event_timeout(*q, dev->cmds[seqno].signalled, HZ);
- r = time_before(jiffies, stamp + HZ);
+ wait_event_timeout(*q, dev->cmds[seqno].signalled, (HZ * waitsecs));
+ r = time_before(jiffies, stamp + (HZ * waitsecs));
if (r)
ret = SAA_OK;
else
diff --git a/drivers/media/video/saa7164/saa7164-core.c b/drivers/media/video/saa7164/saa7164-core.c
index 2fbf420..8f68a5d 100644
--- a/drivers/media/video/saa7164/saa7164-core.c
+++ b/drivers/media/video/saa7164/saa7164-core.c
@@ -49,6 +49,10 @@
module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "enable debug messages");
+unsigned int waitsecs = 1;
+module_param(waitsecs, int, 0644);
+MODULE_PARM_DESC(debug, "timeout on firmware messages");
+
static unsigned int card[] = {[0 ... (SAA7164_MAXBOARDS - 1)] = UNSET };
module_param_array(card, int, NULL, 0444);
MODULE_PARM_DESC(card, "card type");
@@ -662,6 +666,7 @@
printk(KERN_ERR "%s() Unsupported board detected, "
"registering without firmware\n", __func__);
+ printk(KERN_INFO "%s() waitsecs = %d\n", __func__, waitsecs);
fail_fw:
return 0;
diff --git a/drivers/media/video/saa7164/saa7164.h b/drivers/media/video/saa7164/saa7164.h
index e0d8ec0..93a75e1 100644
--- a/drivers/media/video/saa7164/saa7164.h
+++ b/drivers/media/video/saa7164/saa7164.h
@@ -294,6 +294,7 @@
};
extern struct list_head saa7164_devlist;
+extern unsigned int waitsecs;
/* ----------------------------------------------------------- */
/* saa7164-core.c */