Skip to content

Commit

Permalink
ALSA: emu10k1: Load firmware when it was already cached
Browse files Browse the repository at this point in the history
This expands the regression fix from
d282159.
The firmware also needs to be loaded when it was already cached.

Signed-off-by: Florian Zeitz <florob@babelmonkeys.de>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Florian Zeitz authored and Takashi Iwai committed Feb 25, 2013
1 parent c2d3703 commit b56ddbe
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions sound/pci/emu10k1/emu10k1_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -860,11 +860,12 @@ 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;
}
}

err = snd_emu1010_load_firmware(emu);
if (err != 0) {
snd_printk(KERN_INFO "emu1010: Loading Firmware failed\n");
return err;
}

/* ID, should read & 0x7f = 0x55 when FPGA programmed. */
Expand Down

0 comments on commit b56ddbe

Please sign in to comment.