Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

sound/oss/trident.c

+2 −2
Original line number Diff line number Diff line
@@ -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) {