diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-04-24 07:55:20 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-04-24 08:11:49 +0200 |
| commit | e08b34e86dfdb72a62196ce0f03d33f48958d8b9 (patch) | |
| tree | 9e677f274f4bc9459ff3ac2cfb0b8f99a7625146 /include/sound/emu10k1.h | |
| parent | 3e0d611b2045b230c3acfb05c3b5ce53b09f6cdd (diff) | |
| download | linux-e08b34e86dfdb72a62196ce0f03d33f48958d8b9.tar.gz linux-e08b34e86dfdb72a62196ce0f03d33f48958d8b9.tar.bz2 linux-e08b34e86dfdb72a62196ce0f03d33f48958d8b9.zip | |
ALSA: emu10k1: Fix dock firmware loading
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>
Cc: <stable@vger.kernel.org> [v3.8+]
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound/emu10k1.h')
| -rw-r--r-- | include/sound/emu10k1.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/sound/emu10k1.h b/include/sound/emu10k1.h index f841ba4bacb8..dfb42ca6d043 100644 --- a/include/sound/emu10k1.h +++ b/include/sound/emu10k1.h @@ -1787,6 +1787,7 @@ struct snd_emu10k1 { unsigned int next_free_voice; const struct firmware *firmware; + const struct firmware *dock_fw; #ifdef CONFIG_PM_SLEEP unsigned int *saved_ptr; |