diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-04-19 05:40:02 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-04-19 05:40:02 -0400 |
| commit | d6aa764ee8674512287913fcc3a0b1b5c050d5eb (patch) | |
| tree | 0cb4a8f6d6cd6f649e705dce6390fa99afc859e0 /sound | |
| parent | 81584a079fc7a18b53fc7db4232419a8faadd414 (diff) | |
| parent | 3126a1790e897252868941bd29a3dd526b506804 (diff) | |
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.c | 2 |
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) | |||
| 490 | if (newtime != curtime) | 490 | if (newtime != curtime) |
| 491 | break; | 491 | break; |
| 492 | } | 492 | } |
| 493 | if (count >= 16384) | 493 | if (count > 16384) |
| 494 | break; | 494 | break; |
| 495 | curtime = newtime; | 495 | curtime = newtime; |
| 496 | } | 496 | } |