Skip to content

Commit

Permalink
ALSA: emu10k1: Fix regression in emu1010 firmware loading
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mihail Zenkov authored and Takashi Iwai committed Feb 22, 2013
1 parent 30efd8d commit d282159
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions sound/pci/emu10k1/emu10k1_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down

0 comments on commit d282159

Please sign in to comment.