From 6869823438702cea5ceea5431607a840585b66e2 Mon Sep 17 00:00:00 2001 From: Steven Toth Date: Mon, 11 May 2009 20:42:03 -0300 Subject: [PATCH] --- yaml --- r: 164139 b: refs/heads/master c: f4a6adf1e54324756917459c52ec7bfdc28d6e7f h: refs/heads/master i: 164137: 1bd87a58cd6301a851678f82d2ffcd1bbb29e341 164135: d6fbf691faa583b40712190e4151701438cae535 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/saa7164/saa7164-fw.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 435ccd7efbae..c460a2a844e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a6450d4d43a4d4caecaa3ca7796cbe8c7cfbba3 +refs/heads/master: f4a6adf1e54324756917459c52ec7bfdc28d6e7f diff --git a/trunk/drivers/media/video/saa7164/saa7164-fw.c b/trunk/drivers/media/video/saa7164/saa7164-fw.c index 6595dd67c5c3..ee0af3534ede 100644 --- a/trunk/drivers/media/video/saa7164/saa7164-fw.c +++ b/trunk/drivers/media/video/saa7164/saa7164-fw.c @@ -40,14 +40,13 @@ int saa7164_dl_wait_ack(struct saa7164_dev *dev, u32 reg) { u32 timeout = SAA_DEVICE_TIMEOUT; while ((saa7164_readl(reg) & 0x01) == 0) { - timeout -= 5; + timeout -= 10; if (timeout == 0) { printk(KERN_ERR "%s() timeout (no d/l ack)\n", __func__); return -EBUSY; } - /* TODO: Review this for efficiency, f/w load is slow */ - msleep(1); + msleep(100); } return 0; @@ -57,14 +56,13 @@ int saa7164_dl_wait_clr(struct saa7164_dev *dev, u32 reg) { u32 timeout = SAA_DEVICE_TIMEOUT; while (saa7164_readl(reg) & 0x01) { - timeout -= 5; + timeout -= 10; if (timeout == 0) { printk(KERN_ERR "%s() timeout (no d/l clr)\n", __func__); return -EBUSY; } - /* TODO: Review this for efficiency, f/w load is slow */ - msleep(1); + msleep(100); } return 0;