lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (12936): SAA7164: Added waitsecs module parameter

Browse Source 
Signed-off-by: Steven Toth <stoth@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Steven Toth
2009-07-30 09:09:30 -03:00
committed by Mauro Carvalho Chehab
parent 3224401e4c
commit dd1ee4442d
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/video/saa7164/saa7164-cmd.c
View File

@@ -234,8 +234,8 @@ int saa7164_cmd_wait(struct saa7164_dev *dev, u8 seqno)
__func__, seqno, dev->cmds[seqno].signalled); __func__, seqno, dev->cmds[seqno].signalled);
/* Wait for signalled to be flagged or timeout */ /* Wait for signalled to be flagged or timeout */
wait_event_timeout(*q, dev->cmds[seqno].signalled, HZ); wait_event_timeout(*q, dev->cmds[seqno].signalled, (HZ * waitsecs));
r = time_before(jiffies, stamp + HZ); r = time_before(jiffies, stamp + (HZ * waitsecs));
if (r) if (r)
ret = SAA_OK; ret = SAA_OK;
else else

5
drivers/media/video/saa7164/saa7164-core.c
View File

@@ -49,6 +49,10 @@ unsigned int debug;
module_param(debug, int, 0644); module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "enable debug messages"); 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 }; static unsigned int card[] = {[0 ... (SAA7164_MAXBOARDS - 1)] = UNSET };
module_param_array(card, int, NULL, 0444); module_param_array(card, int, NULL, 0444);
MODULE_PARM_DESC(card, "card type"); MODULE_PARM_DESC(card, "card type");
@@ -662,6 +666,7 @@ static int __devinit saa7164_initdev(struct pci_dev *pci_dev,
printk(KERN_ERR "%s() Unsupported board detected, " printk(KERN_ERR "%s() Unsupported board detected, "
"registering without firmware\n", __func__); "registering without firmware\n", __func__);
printk(KERN_INFO "%s() waitsecs = %d\n", __func__, waitsecs);
fail_fw: fail_fw:
return 0; return 0;

1
drivers/media/video/saa7164/saa7164.h
View File

@@ -294,6 +294,7 @@ struct saa7164_dev {
}; };
extern struct list_head saa7164_devlist; extern struct list_head saa7164_devlist;
extern unsigned int waitsecs;
/* ----------------------------------------------------------- */ /* ----------------------------------------------------------- */
/* saa7164-core.c */ /* saa7164-core.c */