git.ipfire.org Git - thirdparty/kernel/stable.git/commit

author	Takashi Iwai <tiwai@suse.de>
	Wed, 24 Apr 2013 05:55:20 +0000 (07:55 +0200)
committer	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
	Wed, 8 May 2013 03:33:09 +0000 (20:33 -0700)
commit	53fca514d62466dba7e4c50d5b0187e6f12cfc36
tree	b67d2005f5a505017ef7c3842e6fd83b2591d4e9	tree \| snapshot
parent	9bcb757351e7e4d448a53cf939ff362a83c09433	commit \| diff

ALSA: emu10k1: Fix dock firmware loading

commit e08b34e86dfdb72a62196ce0f03d33f48958d8b9 upstream.

The commit [b209c4df: ALSA: emu10k1: cache emu1010 firmware] broke the
firmware loading of the dock, just (mistakenly) ignoring a different
firmware for docks on some models. This patch revives them again.

Bugzilla: https://bugs.archlinux.org/task/34865
Reported-and-tested-by: Tobias Powalowski <tobias.powalowski@googlemail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

include/sound/emu10k1.h		diff \| blob \| blame \| history
sound/pci/emu10k1/emu10k1_main.c		diff \| blob \| blame \| history