Commit d2821599 authored by Mihail Zenkov's avatar Mihail Zenkov Committed by Takashi Iwai

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: default avatarMihail Zenkov <mihail.zenkov@gmail.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 30efd8de
...@@ -860,6 +860,11 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu) ...@@ -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", 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);
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. */ /* ID, should read & 0x7f = 0x55 when FPGA programmed. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment