Skip to content

Commit

Permalink
sound/oss/trident.c: fix incorrect test in trident_ac97_set()
Browse files Browse the repository at this point in the history
If count reaches zero, the loop ends, but the postfix decrement still
subtracts: testing for 'count == 0' will not work.

Signed-off-by: Roel Kluin <12o3l@tiscali.nl>
Reviewed-by: Ray Lee <ray-lk@madrabbit.org>
Acked-by: Muli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Roel Kluin authored and Linus Torvalds committed Feb 6, 2008
1 parent 67a3b2b commit be6c28e
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions sound/oss/trident.c
Original file line number Diff line number Diff line change
Expand Up @@ -2935,7 +2935,7 @@ trident_ac97_set(struct ac97_codec *codec, u8 reg, u16 val)
do {
if ((inw(TRID_REG(card, address)) & busy) == 0)
break;
} while (count--);
} while (--count);

data |= (mask | (reg & AC97_REG_ADDR));

Expand Down Expand Up @@ -2996,7 +2996,7 @@ trident_ac97_get(struct ac97_codec *codec, u8 reg)
data = inl(TRID_REG(card, address));
if ((data & busy) == 0)
break;
} while (count--);
} while (--count);
spin_unlock_irqrestore(&card->lock, flags);

if (count == 0) {
Expand Down

0 comments on commit be6c28e

Please sign in to comment.