From 76d09eabf3ef361efc0a51125cd6da380a9239e5 Mon Sep 17 00:00:00 2001 From: Florian Zeitz Date: Mon, 25 Feb 2013 09:53:35 +0100 Subject: [PATCH] ALSA: emu10k1: Load firmware when it was already cached commit b56ddbe55a363eee4ff7410a97050dad08215f7c upstream. This expands the regression fix from d28215996b0c3a900411769039aa3c54cf7008ab. The firmware also needs to be loaded when it was already cached. Signed-off-by: Florian Zeitz Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/pci/emu10k1/emu10k1_main.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index 5115f1104dfb..e6b016693240 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c @@ -860,11 +860,12 @@ 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; - } + } + + err = snd_emu1010_load_firmware(emu); + if (err != 0) { + snd_printk(KERN_INFO "emu1010: Loading Firmware failed\n"); + return err; } /* ID, should read & 0x7f = 0x55 when FPGA programmed. */ -- 2.39.5