---

yaml --- r: 164147 b: refs/heads/master c: dd1ee44 h: refs/heads/master i: 164145: 42cec3c 164143: bf67109 v: v3
git-mirror · Sep 19, 2009 · f9aadf8 · f9aadf8
1 parent 42ec35a
commit f9aadf8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3224401e4c6154bf556d669ed36743cc9a38ffad
+refs/heads/master: dd1ee4442d14f90d4da6b8a2ee37ab922100f250
diff --git a/trunk/drivers/media/video/saa7164/saa7164-cmd.c b/trunk/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/trunk/drivers/media/video/saa7164/saa7164-core.c b/trunk/drivers/media/video/saa7164/saa7164-core.c
@@ -49,6 +49,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");
@@ -662,6 +666,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/trunk/drivers/media/video/saa7164/saa7164.h b/trunk/drivers/media/video/saa7164/saa7164.h
@@ -294,6 +294,7 @@ struct saa7164_dev {
 };
 
 extern struct list_head saa7164_devlist;
+extern unsigned int waitsecs;
 
 /* ----------------------------------------------------------- */
 /* saa7164-core.c                                              */