From: Steven Toth Date: Mon, 11 May 2009 23:42:03 +0000 (-0300) Subject: V4L/DVB (12928): SAA7164: Increase firmware load tolerance X-Git-Tag: android-x86-2.2~4024^2~144 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f4a6adf1e54324756917459c52ec7bfdc28d6e7f;p=android-x86%2Fkernel.git V4L/DVB (12928): SAA7164: Increase firmware load tolerance It's timing out and aborting firmware load too quickly on some platforms, this increases the upper limit. Signed-off-by: Steven Toth Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/video/saa7164/saa7164-fw.c b/drivers/media/video/saa7164/saa7164-fw.c index 6595dd67c5c3..ee0af3534ede 100644 --- a/drivers/media/video/saa7164/saa7164-fw.c +++ b/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;