Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 372055
b: refs/heads/master
c: 7603935
h: refs/heads/master
i:
  372053: e91e316
  372051: 4c72fd1
  372047: b65e3ed
v: v3
  • Loading branch information
Arnd Bergmann authored and Takashi Iwai committed Apr 26, 2013
1 parent 3d8cd82 commit ee9a8e8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 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: 2fc565e4eaf8fc633bfc741b90e1f28dba732ee1
refs/heads/master: 7603935838ae3a85b56f0b5662ab785518d68d39
8 changes: 4 additions & 4 deletions trunk/sound/pci/ali5451/ali5451.c
Original file line number Diff line number Diff line change
Expand Up @@ -451,10 +451,10 @@ static int snd_ali_reset_5451(struct snd_ali *codec)
if (pci_dev) {
pci_read_config_dword(pci_dev, 0x7c, &dwVal);
pci_write_config_dword(pci_dev, 0x7c, dwVal | 0x08000000);
udelay(5000);
mdelay(5);
pci_read_config_dword(pci_dev, 0x7c, &dwVal);
pci_write_config_dword(pci_dev, 0x7c, dwVal & 0xf7ffffff);
udelay(5000);
mdelay(5);
}

pci_dev = codec->pci;
Expand All @@ -463,14 +463,14 @@ static int snd_ali_reset_5451(struct snd_ali *codec)
udelay(500);
pci_read_config_dword(pci_dev, 0x44, &dwVal);
pci_write_config_dword(pci_dev, 0x44, dwVal & 0xfffbffff);
udelay(5000);
mdelay(5);

wCount = 200;
while(wCount--) {
wReg = snd_ali_codec_peek(codec, 0, AC97_POWERDOWN);
if ((wReg & 0x000f) == 0x000f)
return 0;
udelay(5000);
mdelay(5);
}

/* non-fatal if you have a non PM capable codec */
Expand Down

0 comments on commit ee9a8e8

Please sign in to comment.