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

Unverified Commit 123af904 authored by Dan Carpenter's avatar Dan Carpenter Committed by Mark Brown
Browse files

ASoC: au1x: Fix timeout tests in au1xac97c_ac97_read() 



The loop timeout doesn't work because it's a post op and ends with "tmo"
set to -1.  I changed it from a post-op to a pre-op and I changed the
initial the starting value from 5 to 6 so we still iterate 5 times.  I
left the other as it was because it's a large number.

Fixes: b3c70c9e ("ASoC: Alchemy AC97C/I2SC audio support")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4fbd8d19

sound/soc/au1x/ac97c.c

+3 −3
Original line number Diff line number Diff line
@@ -91,8 +91,8 @@ static unsigned short au1xac97c_ac97_read(struct snd_ac97 *ac97, 
	do {

		mutex_lock(&ctx->lock);



		tmo = 5;

		while ((RD(ctx, AC97_STATUS) & STAT_CP) && tmo--)

		tmo = 6;

		while ((RD(ctx, AC97_STATUS) & STAT_CP) && --tmo)

			udelay(21);	/* wait an ac97 frame time */

		if (!tmo) {

			pr_debug("ac97rd timeout #1\n");
@@ -105,7 +105,7 @@ static unsigned short au1xac97c_ac97_read(struct snd_ac97 *ac97, 
		 * poll, Forrest, poll...

		 */

		tmo = 0x10000;

		while ((RD(ctx, AC97_STATUS) & STAT_CP) && tmo--)

		while ((RD(ctx, AC97_STATUS) & STAT_CP) && --tmo)

			asm volatile ("nop");

		data = RD(ctx, AC97_CMDRESP);