Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 206662
b: refs/heads/master
c: 08b4509
h: refs/heads/master
v: v3
  • Loading branch information
David Dillow authored and Jaroslav Kysela committed Jun 28, 2010
1 parent 09bf74f commit 33794f1
Show file tree
Hide file tree
Showing 2 changed files with 4 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: 3a3d5fd125f82200019ef406c4d51ba4d9f0a604
refs/heads/master: 08b450988905505d12f7671bc24b8da73631d327
6 changes: 3 additions & 3 deletions trunk/sound/pci/sis7019.c
Original file line number Diff line number Diff line change
Expand Up @@ -1049,7 +1049,7 @@ static int sis_chip_free(struct sis7019 *sis)
/* Reset the chip, and disable all interrputs.
*/
outl(SIS_GCR_SOFTWARE_RESET, sis->ioport + SIS_GCR);
udelay(10);
udelay(25);
outl(0, sis->ioport + SIS_GCR);
outl(0, sis->ioport + SIS_GIER);

Expand Down Expand Up @@ -1085,7 +1085,7 @@ static int sis_chip_init(struct sis7019 *sis)
/* Reset the audio controller
*/
outl(SIS_GCR_SOFTWARE_RESET, io + SIS_GCR);
udelay(10);
udelay(25);
outl(0, io + SIS_GCR);

/* Get the AC-link semaphore, and reset the codecs
Expand All @@ -1098,7 +1098,7 @@ static int sis_chip_init(struct sis7019 *sis)
return -EIO;

outl(SIS_AC97_CMD_CODEC_COLD_RESET, io + SIS_AC97_CMD);
udelay(10);
udelay(250);

count = 0xffff;
while ((inw(io + SIS_AC97_STATUS) & SIS_AC97_STATUS_BUSY) && --count)
Expand Down

0 comments on commit 33794f1

Please sign in to comment.