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

Commit 051b5165 authored by Charles R. Anderson's avatar Charles R. Anderson Committed by Jaroslav Kysela
Browse files

[ALSA] Fix maestro3 hang after cold boot 



Modules: Maestro3 driver

This patch fixes the maestro3 driver to call the snd_m3_assp_init
function to write the DSP firmware into the ASSP chip before sending the
RUN_ASSP command, thereby solving the hang after a cold boot.

Signed-off-by: default avatarCharles R. Anderson <cra@alum.wpi.edu>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent c829b052

sound/pci/maestro3.c

+1 −1
Original line number Diff line number Diff line
@@ -2476,6 +2476,7 @@ snd_m3_chip_init(m3_t *chip) 
	t |= ASSP_0_WS_ENABLE; 

	outb(t, chip->iobase + ASSP_CONTROL_A);



	snd_m3_assp_init(chip); /* download DSP code before starting ASSP below */

	outb(RUN_ASSP, chip->iobase + ASSP_CONTROL_B); 



	outb(0x00, io + HARDWARE_VOL_CTRL);
@@ -2734,7 +2735,6 @@ snd_m3_create(snd_card_t *card, struct pci_dev *pci, 


	snd_m3_ac97_reset(chip);



	snd_m3_assp_init(chip);

	snd_m3_amp_enable(chip, 1);



	tasklet_init(&chip->hwvol_tq, snd_m3_update_hw_volume, (unsigned long)chip);