Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b56ddbe5 authored by Florian Zeitz's avatar Florian Zeitz Committed by Takashi Iwai
Browse files

ALSA: emu10k1: Load firmware when it was already cached 



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

Signed-off-by: default avatarFlorian Zeitz <florob@babelmonkeys.de>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent c2d3703c

sound/pci/emu10k1/emu10k1_main.c

+6 −5
Original line number Diff line number Diff line
@@ -860,12 +860,13 @@ 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);

		snd_printk(KERN_INFO "emu1010: Loading Firmware failed\n");

		return err;

	}

	}



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

	snd_emu1010_fpga_read(emu, EMU_HANA_ID, &reg);