Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 99050
b: refs/heads/master
c: 33e5b22
h: refs/heads/master
v: v3
  • Loading branch information
Werner Almesberger authored and Jaroslav Kysela committed May 19, 2008
1 parent e6c1f3b commit a13a77c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 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: a65f0568f6cc8433877fb71dd7d36b551854b0bc
refs/heads/master: 33e5b22285f63ede858c00456f3ffbc2ea79d6cf
5 changes: 3 additions & 2 deletions trunk/sound/soc/s3c24xx/s3c24xx-i2s.c
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ static void s3c24xx_snd_rxctrl(int on)
static int s3c24xx_snd_lrsync(void)
{
u32 iiscon;
unsigned long timeout = jiffies + msecs_to_jiffies(5);
int timeout = 50; /* 5ms */

DBG("Entered %s\n", __func__);

Expand All @@ -184,8 +184,9 @@ static int s3c24xx_snd_lrsync(void)
if (iiscon & S3C2410_IISCON_LRINDEX)
break;

if (time_after(jiffies, timeout))
if (!timeout--)
return -ETIMEDOUT;
udelay(100);
}

return 0;
Expand Down

0 comments on commit a13a77c

Please sign in to comment.