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

Commit 988f0664 authored by Karsten Wiese's avatar Karsten Wiese Committed by Takashi Iwai
Browse files

[ALSA] ice1724.c: toggle "chip reset" and "eeprom based setup" sequence 



Let "chip reset" become first. Increasement of the "chip reset" related timeout
leads to correctly read eeprom's contents here.

Signed-off-by: default avatarKarsten Wiese <fzu@wemgehoertderstaat.de>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 0d52cea4

sound/pci/ice1712/ice1724.c

+8 −3
Original line number Diff line number Diff line
@@ -2045,12 +2045,16 @@ static int __devinit snd_vt1724_read_eeprom(struct snd_ice1712 *ice, 






static int __devinit snd_vt1724_chip_init(struct snd_ice1712 *ice)

static void __devinit snd_vt1724_chip_reset(struct snd_ice1712 *ice)

{

	outb(VT1724_RESET , ICEREG1724(ice, CONTROL));

	udelay(200);

	msleep(10);

	outb(0, ICEREG1724(ice, CONTROL));

	udelay(200);

	msleep(10);

}



static int __devinit snd_vt1724_chip_init(struct snd_ice1712 *ice)

{

	outb(ice->eeprom.data[ICE_EEP2_SYSCONF], ICEREG1724(ice, SYS_CFG));

	outb(ice->eeprom.data[ICE_EEP2_ACLINK], ICEREG1724(ice, AC97_CFG));

	outb(ice->eeprom.data[ICE_EEP2_I2S], ICEREG1724(ice, I2S_FEATURES));
@@ -2223,6 +2227,7 @@ static int __devinit snd_vt1724_create(struct snd_card *card, 


	ice->irq = pci->irq;



	snd_vt1724_chip_reset(ice);

	if (snd_vt1724_read_eeprom(ice, modelname) < 0) {

		snd_vt1724_free(ice);

		return -EIO;