[PATCH] fix incorrect test in trident_ac97_set(); sound/oss/trident.c

From: Roel Kluin
Date: Wed Nov 07 2007 - 13:34:42 EST


If count reaches zero, the loop ends, but the postfix decrement subtracts it.
so, testing for 'count == 0' will not work.

Signed-off-by: Roel Kluin <12o3l@xxxxxxxxxx>
---
diff --git a/sound/oss/trident.c b/sound/oss/trident.c
index 96adc47..94b5fb4 100644
--- a/sound/oss/trident.c
+++ b/sound/oss/trident.c
@@ -2939,7 +2939,7 @@ trident_ac97_set(struct ac97_codec *codec, u8 reg, u16 val)

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

- if (count == 0) {
+ if (count == -1) {
printk(KERN_ERR "trident: AC97 CODEC write timed out.\n");
spin_unlock_irqrestore(&card->lock, flags);
return;
@@ -2999,7 +2999,7 @@ trident_ac97_get(struct ac97_codec *codec, u8 reg)
} while (count--);
spin_unlock_irqrestore(&card->lock, flags);

- if (count == 0) {
+ if (count == -1) {
printk(KERN_ERR "trident: AC97 CODEC read timed out.\n");
data = 0;
}

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/