lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'fix/misc' into for-linus

Browse Source 
* fix/misc:
  ALSA: MAINTAINERS - Update SOUND
  ALSA: emu10k1 - off by 1 in snd_emu10k1_wait()
This commit is contained in:
Takashi Iwai
2009-04-19 11:40:02 +02:00
parent 81584a079f 3126a1790e
commit d6aa764ee8
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
MAINTAINERS
View File

@@ -5235,7 +5235,12 @@ M: perex@perex.cz
P: Takashi Iwai P: Takashi Iwai
M: tiwai@suse.de M: tiwai@suse.de
L: alsa-devel@alsa-project.org (subscribers-only) 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 S: Maintained
F: Documentation/sound/
F: include/sound/
F: sound/ F: sound/
SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC) SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)

2
sound/pci/emu10k1/io.c
View File

@@ -490,7 +490,7 @@ void snd_emu10k1_wait(struct snd_emu10k1 *emu, unsigned int wait)
if (newtime != curtime) if (newtime != curtime)
break; break;
} }
if (count >= 16384) if (count > 16384)
break; break;
curtime = newtime; curtime = newtime;
} }