summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMihail Zenkov <mihail.zenkov@gmail.com>2013-02-22 11:25:27 +0000
committerTakashi Iwai <tiwai@suse.de>2013-02-22 13:56:20 +0100
commitd28215996b0c3a900411769039aa3c54cf7008ab (patch)
treef5412a51da6c85f15e1153751bb0d19c199a76e7 /sound
parent30efd8debd1ef30be342d374f01e993509f5b76b (diff)
downloadlinux-d28215996b0c3a900411769039aa3c54cf7008ab.tar.bz2
ALSA: emu10k1: Fix regression in emu1010 firmware loading
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> Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/emu10k1/emu10k1_main.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index a7c296a36a17..5115f1104dfb 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. */