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

Commit f6f35bbe authored by Roel Kluin's avatar Roel Kluin Committed by Russell King
Browse files

[ARM] AACI: timeout will reach -1 



With a postfix decrement the timeout will reach -1 rather than 0,
so the warning will not be issued.

Signed-off-by: default avatarRoel Kluin <roel.kluin@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent e0fc4f97

sound/arm/aaci.c

+3 −3
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static void aaci_ac97_write(struct snd_ac97 *ac97, unsigned short reg, 
	 */

	do {

		v = readl(aaci->base + AACI_SLFR);

	} while ((v & (SLFR_1TXB|SLFR_2TXB)) && timeout--);

	} while ((v & (SLFR_1TXB|SLFR_2TXB)) && --timeout);



	if (!timeout)

		dev_err(&aaci->dev->dev,
@@ -126,7 +126,7 @@ static unsigned short aaci_ac97_read(struct snd_ac97 *ac97, unsigned short reg) 
	 */

	do {

		v = readl(aaci->base + AACI_SLFR);

	} while ((v & SLFR_1TXB) && timeout--);

	} while ((v & SLFR_1TXB) && --timeout);



	if (!timeout) {

		dev_err(&aaci->dev->dev, "timeout on slot 1 TX busy\n");
@@ -147,7 +147,7 @@ static unsigned short aaci_ac97_read(struct snd_ac97 *ac97, unsigned short reg) 
	do {

		cond_resched();

		v = readl(aaci->base + AACI_SLFR) & (SLFR_1RXV|SLFR_2RXV);

	} while ((v != (SLFR_1RXV|SLFR_2RXV)) && timeout--);

	} while ((v != (SLFR_1RXV|SLFR_2RXV)) && --timeout);



	if (!timeout) {

		dev_err(&aaci->dev->dev, "timeout on RX valid\n");