From f5b97bc3c2db41f4e309fe8d71d60fade89c1b32 Mon Sep 17 00:00:00 2001 From: Roel Kluin Date: Sun, 8 Feb 2009 15:22:25 +0100 Subject: [PATCH] --- yaml --- r: 131233 b: refs/heads/master c: f6f35bbe7c6494e66590cf519e21da2dd8d59e01 h: refs/heads/master i: 131231: 58abfd5045a036b0168c6851d3e90ee0a3447c63 v: v3 --- [refs] | 2 +- trunk/sound/arm/aaci.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 603c4ebe9da6..c43dbaece35e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e0fc4f97ab6b11594d0b0658ef6cf02bd68f3b4e +refs/heads/master: f6f35bbe7c6494e66590cf519e21da2dd8d59e01 diff --git a/trunk/sound/arm/aaci.c b/trunk/sound/arm/aaci.c index 89096e811a4b..772901e41ecb 100644 --- a/trunk/sound/arm/aaci.c +++ b/trunk/sound/arm/aaci.c @@ -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, @@ -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"); @@ -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");