From d221ea7cfc5b12ce03477b95faf3da63dcd84224 Mon Sep 17 00:00:00 2001 From: Steven Toth Date: Sat, 8 Aug 2009 10:22:02 -0300 Subject: [PATCH] --- yaml --- r: 164149 b: refs/heads/master c: bbf504c37ddced9957fa65aac9a213f322871b07 h: refs/heads/master i: 164147: f9aadf82f1d8ed9bb9119e1460d67f2a6fab9478 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/saa7164/saa7164-cmd.c | 6 ++++++ trunk/drivers/media/video/saa7164/saa7164-core.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 64be5c8b8a2d..ef8d4486aaa7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2ceae8fdfa55475ef8d7cb9bcaf3fd242ea1edcc +refs/heads/master: bbf504c37ddced9957fa65aac9a213f322871b07 diff --git a/trunk/drivers/media/video/saa7164/saa7164-cmd.c b/trunk/drivers/media/video/saa7164/saa7164-cmd.c index 171ef116f078..cd3af4d4364f 100644 --- a/trunk/drivers/media/video/saa7164/saa7164-cmd.c +++ b/trunk/drivers/media/video/saa7164/saa7164-cmd.c @@ -234,6 +234,12 @@ int saa7164_cmd_wait(struct saa7164_dev *dev, u8 seqno) __func__, seqno, dev->cmds[seqno].signalled); /* Wait for signalled to be flagged or timeout */ + /* In a highly stressed system this can easily extend + * into multiple seconds before the deferred worker + * is scheduled, and we're woken up via signal. + * We typically are signalled in < 50ms but it can + * take MUCH longer. + */ wait_event_timeout(*q, dev->cmds[seqno].signalled, (HZ * waitsecs)); r = time_before(jiffies, stamp + (HZ * waitsecs)); if (r) diff --git a/trunk/drivers/media/video/saa7164/saa7164-core.c b/trunk/drivers/media/video/saa7164/saa7164-core.c index 06dab7cbcaac..da6dbe579624 100644 --- a/trunk/drivers/media/video/saa7164/saa7164-core.c +++ b/trunk/drivers/media/video/saa7164/saa7164-core.c @@ -49,7 +49,7 @@ unsigned int debug; module_param(debug, int, 0644); MODULE_PARM_DESC(debug, "enable debug messages"); -unsigned int waitsecs = 1; +unsigned int waitsecs = 10; module_param(waitsecs, int, 0644); MODULE_PARM_DESC(debug, "timeout on firmware messages");