summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-04-19 11:40:02 +0200
committerTakashi Iwai <tiwai@suse.de>2009-04-19 11:40:02 +0200
commitd6aa764ee8674512287913fcc3a0b1b5c050d5eb (patch)
tree0cb4a8f6d6cd6f649e705dce6390fa99afc859e0 /sound
parent81584a079fc7a18b53fc7db4232419a8faadd414 (diff)
parent3126a1790e897252868941bd29a3dd526b506804 (diff)
downloadlwn-d6aa764ee8674512287913fcc3a0b1b5c050d5eb.tar.gz
lwn-d6aa764ee8674512287913fcc3a0b1b5c050d5eb.zip
Merge branch 'fix/misc' into for-linus
* fix/misc: ALSA: MAINTAINERS - Update SOUND ALSA: emu10k1 - off by 1 in snd_emu10k1_wait()
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/emu10k1/io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/emu10k1/io.c b/sound/pci/emu10k1/io.c
index 4bfc31d1b281..c1a5aa15af8f 100644
--- a/sound/pci/emu10k1/io.c
+++ b/sound/pci/emu10k1/io.c
@@ -490,7 +490,7 @@ void snd_emu10k1_wait(struct snd_emu10k1 *emu, unsigned int wait)
if (newtime != curtime)
break;
}
- if (count >= 16384)
+ if (count > 16384)
break;
curtime = newtime;
}