diff options
| author | Steven Toth <stoth@kernellabs.com> | 2009-05-11 19:42:03 -0400 |
|---|---|---|
| committer | Steven Toth <stoth@kernellabs.com> | 2009-05-11 19:42:03 -0400 |
| commit | 36ba847b7d8b77d4c03bdc46fcbb240f5d435079 (patch) | |
| tree | aef45c601c13f28150a73aac3e876f0e4841aa8b /linux/drivers/media/video | |
| parent | c891751cdfcce6b721ac482c5fa05e1b6ae26daf (diff) | |
| download | mediapointer-dvb-s2-36ba847b7d8b77d4c03bdc46fcbb240f5d435079.tar.gz mediapointer-dvb-s2-36ba847b7d8b77d4c03bdc46fcbb240f5d435079.tar.bz2 | |
SAA7164: Increase firmware load tolerance
From: Steven Toth <stoth@kernellabs.com>
It's timing out and aborting firmware load too quickly on some
platforms, this increases the upper limit.
Priority: normal
Signed-off-by: Steven Toth <stoth@kernellabs.com>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/saa7164/saa7164-fw.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/linux/drivers/media/video/saa7164/saa7164-fw.c b/linux/drivers/media/video/saa7164/saa7164-fw.c index 4cae9c166..1c791bde4 100644 --- a/linux/drivers/media/video/saa7164/saa7164-fw.c +++ b/linux/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; |