Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 131233
b: refs/heads/master
c: f6f35bb
h: refs/heads/master
i:
  131231: 58abfd5
v: v3
  • Loading branch information
Roel Kluin authored and Russell King committed Feb 10, 2009
1 parent 9cfb833 commit f5b97bc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: e0fc4f97ab6b11594d0b0658ef6cf02bd68f3b4e
refs/heads/master: f6f35bbe7c6494e66590cf519e21da2dd8d59e01
6 changes: 3 additions & 3 deletions trunk/sound/arm/aaci.c
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ static void aaci_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
*/
do {
v = readl(aaci->base + AACI_SLFR);
} while ((v & (SLFR_1TXB|SLFR_2TXB)) && timeout--);
} while ((v & (SLFR_1TXB|SLFR_2TXB)) && --timeout);

if (!timeout)
dev_err(&aaci->dev->dev,
Expand Down Expand Up @@ -126,7 +126,7 @@ static unsigned short aaci_ac97_read(struct snd_ac97 *ac97, unsigned short reg)
*/
do {
v = readl(aaci->base + AACI_SLFR);
} while ((v & SLFR_1TXB) && timeout--);
} while ((v & SLFR_1TXB) && --timeout);

if (!timeout) {
dev_err(&aaci->dev->dev, "timeout on slot 1 TX busy\n");
Expand All @@ -147,7 +147,7 @@ static unsigned short aaci_ac97_read(struct snd_ac97 *ac97, unsigned short reg)
do {
cond_resched();
v = readl(aaci->base + AACI_SLFR) & (SLFR_1RXV|SLFR_2RXV);
} while ((v != (SLFR_1RXV|SLFR_2RXV)) && timeout--);
} while ((v != (SLFR_1RXV|SLFR_2RXV)) && --timeout);

if (!timeout) {
dev_err(&aaci->dev->dev, "timeout on RX valid\n");
Expand Down

0 comments on commit f5b97bc

Please sign in to comment.