AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ALSA: emu10k1: Fix regression in emu1010 firmware loading

Browse Source 
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>
This commit is contained in:
Mihail Zenkov 2013-02-22 11:25:27 +00:00 committed by Takashi Iwai
parent 30efd8debd
commit d28215996b
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sound/pci/emu10k1/emu10k1_main.c
View File

@ -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. */