diff options
| author | Florian Zeitz <florob@babelmonkeys.de> | 2013-02-25 09:53:35 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-02-25 09:53:35 +0100 |
| commit | b56ddbe55a363eee4ff7410a97050dad08215f7c (patch) | |
| tree | ad5ec99b677d9ac6148bee77fb51788a841ca6dd /sound | |
| parent | c2d3703cdd4954836f348515b802a5dc4c17710e (diff) | |
| download | linux-stable-b56ddbe55a363eee4ff7410a97050dad08215f7c.tar.gz linux-stable-b56ddbe55a363eee4ff7410a97050dad08215f7c.tar.bz2 linux-stable-b56ddbe55a363eee4ff7410a97050dad08215f7c.zip | |
ALSA: emu10k1: Load firmware when it was already cached
This expands the regression fix from
d28215996b0c3a900411769039aa3c54cf7008ab.
The firmware also needs to be loaded when it was already cached.
Signed-off-by: Florian Zeitz <florob@babelmonkeys.de>
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.c | 11 |
1 files 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. */ |