Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 92233
b: refs/heads/master
c: 988f066
h: refs/heads/master
i:
  92231: 99f5f78
v: v3
  • Loading branch information
Karsten Wiese authored and Takashi Iwai committed Apr 24, 2008
1 parent 0a8cd4c commit 5116497
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 0d52cea487c0213d6d7bca9c951210081e7b653b
refs/heads/master: 988f0664779674c7c06252a6d549eee8debd5d76
11 changes: 8 additions & 3 deletions trunk/sound/pci/ice1712/ice1724.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 5116497

Please sign in to comment.