aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MAINTAINERS5
-rw-r--r--sound/pci/emu10k1/io.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 0beac8a7f8f2..1e067a675e53 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5235,7 +5235,12 @@ M: perex@perex.cz
5235P: Takashi Iwai 5235P: Takashi Iwai
5236M: tiwai@suse.de 5236M: tiwai@suse.de
5237L: alsa-devel@alsa-project.org (subscribers-only) 5237L: alsa-devel@alsa-project.org (subscribers-only)
5238W: http://www.alsa-project.org/
5239T: git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git
5240T: git git://git.alsa-project.org/alsa-kernel.git
5238S: Maintained 5241S: Maintained
5242F: Documentation/sound/
5243F: include/sound/
5239F: sound/ 5244F: sound/
5240 5245
5241SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC) 5246SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)
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 }