Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6aa764e authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'fix/misc' into for-linus 

* fix/misc:
  ALSA: MAINTAINERS - Update SOUND
  ALSA: emu10k1 - off by 1 in snd_emu10k1_wait()
parents 81584a07 3126a179

MAINTAINERS

+5 −0
Original line number Diff line number Diff line
@@ -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)

sound/pci/emu10k1/io.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

	}