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: Mihail Zenkov <mihail.zenkov@gmail.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index a7c296a36a177dc5d861216ee129a666c3aa563e..5115f1104dfb268dadaacf42e6cfea4d535a43bd 100644 (file)
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -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. */