Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 164139
b: refs/heads/master
c: f4a6adf
h: refs/heads/master
i:
  164137: 1bd87a5
  164135: d6fbf69
v: v3
  • Loading branch information
Steven Toth authored and Mauro Carvalho Chehab committed Sep 19, 2009
1 parent efc0268 commit 6869823
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1a6450d4d43a4d4caecaa3ca7796cbe8c7cfbba3
refs/heads/master: f4a6adf1e54324756917459c52ec7bfdc28d6e7f
10 changes: 4 additions & 6 deletions trunk/drivers/media/video/saa7164/saa7164-fw.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down

0 comments on commit 6869823

Please sign in to comment.