diff options
| author | Steven Toth <stoth@kernellabs.com> | 2009-07-30 08:09:30 -0400 |
|---|---|---|
| committer | Steven Toth <stoth@kernellabs.com> | 2009-07-30 08:09:30 -0400 |
| commit | b7acf78f1d46887f8612f17da98e0321fdc50634 (patch) | |
| tree | b2c1cbc35730d7230cf2b941791a68a28bc64bad | |
| parent | eb6b48af2bdca59b38e532cb7a24ebb58dfe53ba (diff) | |
| download | mediapointer-dvb-s2-b7acf78f1d46887f8612f17da98e0321fdc50634.tar.gz mediapointer-dvb-s2-b7acf78f1d46887f8612f17da98e0321fdc50634.tar.bz2 | |
SAA7164: Added waitsecs module parameter
From: Steven Toth <stoth@kernellabs.com>
SAA7164: Added waitsecs module parameter
Priority: normal
Signed-off-by: Steven Toth <stoth@kernellabs.com>
| -rw-r--r-- | linux/drivers/media/video/saa7164/saa7164-cmd.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7164/saa7164-core.c | 5 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7164/saa7164.h | 1 |
3 files changed, 8 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7164/saa7164-cmd.c b/linux/drivers/media/video/saa7164/saa7164-cmd.c index 0c3585bb2..171ef116f 100644 --- a/linux/drivers/media/video/saa7164/saa7164-cmd.c +++ b/linux/drivers/media/video/saa7164/saa7164-cmd.c @@ -234,8 +234,8 @@ int saa7164_cmd_wait(struct saa7164_dev *dev, u8 seqno) __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/linux/drivers/media/video/saa7164/saa7164-core.c b/linux/drivers/media/video/saa7164/saa7164-core.c index 6bb86abb9..59b2c0f6b 100644 --- a/linux/drivers/media/video/saa7164/saa7164-core.c +++ b/linux/drivers/media/video/saa7164/saa7164-core.c @@ -50,6 +50,10 @@ unsigned int debug; 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"); @@ -713,6 +717,7 @@ static int __devinit saa7164_initdev(struct pci_dev *pci_dev, 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/linux/drivers/media/video/saa7164/saa7164.h b/linux/drivers/media/video/saa7164/saa7164.h index d934f3c76..9620b736a 100644 --- a/linux/drivers/media/video/saa7164/saa7164.h +++ b/linux/drivers/media/video/saa7164/saa7164.h @@ -295,6 +295,7 @@ struct saa7164_dev { }; extern struct list_head saa7164_devlist; +extern unsigned int waitsecs; /* ----------------------------------------------------------- */ /* saa7164-core.c */ |