Commit dd1ee444 authored by Steven Toth's avatar Steven Toth Committed by Mauro Carvalho Chehab
Browse files

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



Signed-off-by: default avatarSteven Toth <stoth@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 3224401e

drivers/media/video/saa7164/saa7164-cmd.c

+2 −2
Original line number Diff line number Diff line
@@ -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

drivers/media/video/saa7164/saa7164-core.c

+5 −0
Original line number Diff line number Diff line
@@ -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;

drivers/media/video/saa7164/saa7164.h

+1 −0
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ struct saa7164_dev { 
};



extern struct list_head saa7164_devlist;

extern unsigned int waitsecs;



/* ----------------------------------------------------------- */

/* saa7164-core.c                                              */