diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-04-19 11:40:02 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-04-19 11:40:02 +0200 |
| commit | d6aa764ee8674512287913fcc3a0b1b5c050d5eb (patch) | |
| tree | 0cb4a8f6d6cd6f649e705dce6390fa99afc859e0 | |
| parent | 81584a079fc7a18b53fc7db4232419a8faadd414 (diff) | |
| parent | 3126a1790e897252868941bd29a3dd526b506804 (diff) | |
| download | linux-3.10-d6aa764ee8674512287913fcc3a0b1b5c050d5eb.tar.gz linux-3.10-d6aa764ee8674512287913fcc3a0b1b5c050d5eb.tar.bz2 linux-3.10-d6aa764ee8674512287913fcc3a0b1b5c050d5eb.zip | |
Merge branch 'fix/misc' into for-linus
* fix/misc:
ALSA: MAINTAINERS - Update SOUND
ALSA: emu10k1 - off by 1 in snd_emu10k1_wait()
| -rw-r--r-- | MAINTAINERS | 5 | ||||
| -rw-r--r-- | sound/pci/emu10k1/io.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0beac8a7f8f..1e067a675e5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5235,7 +5235,12 @@ M: perex@perex.cz P: Takashi Iwai M: tiwai@suse.de L: alsa-devel@alsa-project.org (subscribers-only) +W: http://www.alsa-project.org/ +T: git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git +T: git git://git.alsa-project.org/alsa-kernel.git S: Maintained +F: Documentation/sound/ +F: include/sound/ F: sound/ SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC) diff --git a/sound/pci/emu10k1/io.c b/sound/pci/emu10k1/io.c index 4bfc31d1b28..c1a5aa15af8 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; } |