Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 16177
b: refs/heads/master
c: c6a02ca
h: refs/heads/master
i:
  16175: ed8874c
v: v3
  • Loading branch information
James Courtier-Dutton authored and Jaroslav Kysela committed Jan 3, 2006
1 parent ad2a074 commit 9a73f53
Show file tree
Hide file tree
Showing 2 changed files with 5 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: 28bcbdddaffcb2ccf08d06db7cecf047ec66057d
refs/heads/master: c6a02ca29388a806df3df73015ee494a6e055309
7 changes: 4 additions & 3 deletions trunk/sound/pci/emu10k1/io.c
Original file line number Diff line number Diff line change
Expand Up @@ -148,15 +148,16 @@ int snd_emu10k1_spi_write(struct snd_emu10k1 * emu,
snd_emu10k1_ptr20_write(emu, reg, 0, set | data);
result = 1;
/* Wait for status bit to return to 0 */
for (n=0;n<100;n++) {
for (n = 0; n < 100; n++) {
udelay(10);
tmp = snd_emu10k1_ptr20_read(emu, reg, 0);
if (!(tmp & 0x10000)) {
result=0;
result = 0;
break;
}
}
if (result) return 1; /* Timed out */
if (result) /* Timed out */
return 1;
snd_emu10k1_ptr20_write(emu, reg, 0, reset | data);
tmp = snd_emu10k1_ptr20_read(emu, reg, 0); /* Write post */
return 0;
Expand Down

0 comments on commit 9a73f53

Please sign in to comment.