From 36ba847b7d8b77d4c03bdc46fcbb240f5d435079 Mon Sep 17 00:00:00 2001 From: Steven Toth Date: Mon, 11 May 2009 19:42:03 -0400 Subject: SAA7164: Increase firmware load tolerance From: Steven Toth 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 --- linux/drivers/media/video/saa7164/saa7164-fw.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'linux/drivers/media/video/saa7164/saa7164-fw.c') 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; -- cgit v1.2.3