提交 b56ddbe5 编写于 作者: F Florian Zeitz 提交者: Takashi Iwai

ALSA: emu10k1: Load firmware when it was already cached

This expands the regression fix from
d2821599.
The firmware also needs to be loaded when it was already cached.
Signed-off-by: NFlorian Zeitz <florob@babelmonkeys.de>
Cc: <stable@vger.kernel.org>
Signed-off-by: NTakashi Iwai <tiwai@suse.de>
上级 c2d3703c
...@@ -860,12 +860,13 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu) ...@@ -860,12 +860,13 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
} }
snd_printk(KERN_INFO "emu1010: firmware file = %s, size = 0x%zx\n", snd_printk(KERN_INFO "emu1010: firmware file = %s, size = 0x%zx\n",
filename, emu->firmware->size); filename, emu->firmware->size);
}
err = snd_emu1010_load_firmware(emu); err = snd_emu1010_load_firmware(emu);
if (err != 0) { if (err != 0) {
snd_printk(KERN_INFO "emu1010: Loading Firmware file %s failed\n", filename); snd_printk(KERN_INFO "emu1010: Loading Firmware failed\n");
return err; return err;
} }
}
/* ID, should read & 0x7f = 0x55 when FPGA programmed. */ /* ID, should read & 0x7f = 0x55 when FPGA programmed. */
snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg); snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册