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

Commit 7e79443c authored Mar 11, 2011 by Takashi Iwai

ALSA: atiixp - Fix wrong time-out checks during ac-link reset



The time-out in snd_atiixp_aclink_reset() is wrongly checked, and
it resulted in exiting from the loop at the first iteration.

Reported-by: Amir Shamsuddin <AmirS2+alsa@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

parent 966a7f0d

sound/pci/atiixp.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -522,7 +522,7 @@ static int snd_atiixp_aclink_reset(struct atiixp *chip)
	atiixp_read(chip, CMD);		atiixp_read(chip, CMD);
	mdelay(1);		mdelay(1);
	atiixp_update(chip, CMD, ATI_REG_CMD_AC_RESET, ATI_REG_CMD_AC_RESET);		atiixp_update(chip, CMD, ATI_REG_CMD_AC_RESET, ATI_REG_CMD_AC_RESET);
	if (--timeout) {		if (!--timeout) {
	snd_printk(KERN_ERR "atiixp: codec reset timeout\n");		snd_printk(KERN_ERR "atiixp: codec reset timeout\n");
	break;		break;
	}		}

sound/pci/atiixp_modem.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -498,7 +498,7 @@ static int snd_atiixp_aclink_reset(struct atiixp_modem *chip)
	atiixp_read(chip, CMD);		atiixp_read(chip, CMD);
	msleep(1);		msleep(1);
	atiixp_update(chip, CMD, ATI_REG_CMD_AC_RESET, ATI_REG_CMD_AC_RESET);		atiixp_update(chip, CMD, ATI_REG_CMD_AC_RESET, ATI_REG_CMD_AC_RESET);
	if (--timeout) {		if (!--timeout) {
	snd_printk(KERN_ERR "atiixp-modem: codec reset timeout\n");		snd_printk(KERN_ERR "atiixp-modem: codec reset timeout\n");
	break;		break;
	}		}