diff options
| author | Roel Kluin <12o3l@tiscali.nl> | 2008-02-06 01:36:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-06 10:41:03 -0800 |
| commit | be6c28e62e3a304b74013afab029af2021e1f50d (patch) | |
| tree | 38d881b0bbdcf9c7913d25f5a88047abf1f62415 /sound | |
| parent | 67a3b2b6ce09809b21f60401e81663f2c8131640 (diff) | |
| download | linux-3.10-be6c28e62e3a304b74013afab029af2021e1f50d.tar.gz linux-3.10-be6c28e62e3a304b74013afab029af2021e1f50d.tar.bz2 linux-3.10-be6c28e62e3a304b74013afab029af2021e1f50d.zip | |
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: 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>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/oss/trident.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/oss/trident.c b/sound/oss/trident.c index 96adc47917a..6959ee1bd17 100644 --- a/sound/oss/trident.c +++ b/sound/oss/trident.c @@ -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)); @@ -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) { |