diff options
| author | Mihail Zenkov <mihail.zenkov@gmail.com> | 2013-02-22 11:25:27 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-03-04 06:03:31 +0800 |
| commit | 83092b1c99832c76e9eae9d94284745830683367 (patch) | |
| tree | e00437091e860a307dd8ac1bb97ae2f2cf30898b | |
| parent | 22c0bc2801540b486dd89db7abba99790a6ec876 (diff) | |
ALSA: emu10k1: Fix regression in emu1010 firmware loading
commit d28215996b0c3a900411769039aa3c54cf7008ab upstream.
This patch fix regression in emu1010 firmware loading after
http://git.alsa-project.org/?p=alsa-kprivate.git;a=commitdiff;h=b209c4dfcd960ab176d4746ab7dc442a3edb4575
I just revert small part of this commit. Tested on emu1212m pci.
Signed-off-by: Mihail Zenkov <mihail.zenkov@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | sound/pci/emu10k1/emu10k1_main.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index a7c296a36a1..5115f1104df 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c @@ -860,6 +860,11 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu) } snd_printk(KERN_INFO "emu1010: firmware file = %s, size = 0x%zx\n", filename, emu->firmware->size); + err = snd_emu1010_load_firmware(emu); + if (err != 0) { + snd_printk(KERN_INFO "emu1010: Loading Firmware file %s failed\n", filename); + return err; + } } /* ID, should read & 0x7f = 0x55 when FPGA programmed. */ |