git.kernelconcepts.de Git - karo-tx-linux.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:08:21 +0000 (20:08 -0700)
commit	ae6f3c644ca300425e79b0d32d3dad214004255f
tree	ffb93077d6cf65efe9d52cf57b26961efbec3d7d	tree \| snapshot
parent	991b9fcab994af5270eab96160617005f9167179	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 \| history
sound/pci/emu10k1/emu10k1_main.c		diff \| blob \| history