Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[ARM] AACI: timeout will reach -1

Browse source 
With a postfix decrement the timeout will reach -1 rather than 0,
so the warning will not be issued.

Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Roel Kluin 2009-02-08 15:22:25 +01:00 committed by Russell King
parent e0fc4f97ab
commit f6f35bbe7c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sound/arm/aaci.c
View file

@ -90,7 +90,7 @@ static void aaci_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
*/ */
do { do {
v = readl(aaci->base + AACI_SLFR); v = readl(aaci->base + AACI_SLFR);
} while ((v & (SLFR_1TXB|SLFR_2TXB)) && timeout--); } while ((v & (SLFR_1TXB|SLFR_2TXB)) && --timeout);
if (!timeout) if (!timeout)
dev_err(&aaci->dev->dev, dev_err(&aaci->dev->dev,
@ -126,7 +126,7 @@ static unsigned short aaci_ac97_read(struct snd_ac97 *ac97, unsigned short reg)
*/ */
do { do {
v = readl(aaci->base + AACI_SLFR); v = readl(aaci->base + AACI_SLFR);
} while ((v & SLFR_1TXB) && timeout--); } while ((v & SLFR_1TXB) && --timeout);
if (!timeout) { if (!timeout) {
dev_err(&aaci->dev->dev, "timeout on slot 1 TX busy\n"); dev_err(&aaci->dev->dev, "timeout on slot 1 TX busy\n");
@ -147,7 +147,7 @@ static unsigned short aaci_ac97_read(struct snd_ac97 *ac97, unsigned short reg)
do { do {
cond_resched(); cond_resched();
v = readl(aaci->base + AACI_SLFR) & (SLFR_1RXV|SLFR_2RXV); 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) { if (!timeout) {
dev_err(&aaci->dev->dev, "timeout on RX valid\n"); dev_err(&aaci->dev->dev, "timeout on RX valid\n");