From: Charles R. Anderson Date: Tue, 18 Oct 2005 16:04:36 +0000 (+0200) Subject: [ALSA] Fix maestro3 hang after cold boot X-Git-Tag: v2.6.15-rc1~451^2~36 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=051b51653309db976c9665f8d4b1774fa1f8124a;p=linux-2.6 [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: Charles R. Anderson Signed-off-by: Takashi Iwai --- diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c index 2693b6f731..7b1b82521c 100644 --- a/sound/pci/maestro3.c +++ b/sound/pci/maestro3.c @@ -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);