Commit be6c28e6 authored by Roel Kluin's avatar Roel Kluin Committed by Linus Torvalds

sound/oss/trident.c: fix incorrect test in trident_ac97_set()

If count reaches zero, the loop ends, but the postfix decrement still
subtracts: testing for 'count == 0' will not work.
Signed-off-by: default avatarRoel Kluin <12o3l@tiscali.nl>
Reviewed-by: default avatarRay Lee <ray-lk@madrabbit.org>
Acked-by: default avatarMuli Ben-Yehuda <muli@il.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 67a3b2b6
...@@ -2935,7 +2935,7 @@ trident_ac97_set(struct ac97_codec *codec, u8 reg, u16 val) ...@@ -2935,7 +2935,7 @@ trident_ac97_set(struct ac97_codec *codec, u8 reg, u16 val)
do { do {
if ((inw(TRID_REG(card, address)) & busy) == 0) if ((inw(TRID_REG(card, address)) & busy) == 0)
break; break;
} while (count--); } while (--count);
data |= (mask | (reg & AC97_REG_ADDR)); data |= (mask | (reg & AC97_REG_ADDR));
...@@ -2996,7 +2996,7 @@ trident_ac97_get(struct ac97_codec *codec, u8 reg) ...@@ -2996,7 +2996,7 @@ trident_ac97_get(struct ac97_codec *codec, u8 reg)
data = inl(TRID_REG(card, address)); data = inl(TRID_REG(card, address));
if ((data & busy) == 0) if ((data & busy) == 0)
break; break;
} while (count--); } while (--count);
spin_unlock_irqrestore(&card->lock, flags); spin_unlock_irqrestore(&card->lock, flags);
if (count == 0) { if (count == 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment