At Sat, 23 Feb 2013 15:36:29 +0100, Florian Zeitz wrote:

This expands the regression fix from d28215996b0c3a900411769039aa3c54cf7008ab. The firmware also needs to be loaded when it was already cached.

Signed-off-by: Florian Zeitz florob@babelmonkeys.de

Thanks, applied now.

Takashi

---

sound/pci/emu10k1/emu10k1_main.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)

[2 0001-ALSA-emu10k1-Load-firmware-when-it-was-already-cache.patch <text/x-patch (7bit)>] diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c index 5115f11..e6b0166 100644 --- a/sound/pci/emu10k1/emu10k1_main.c +++ b/sound/pci/emu10k1/emu10k1_main.c @@ -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. */