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

Commit dafbbb1f authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] hda-intel - Fix pci_disable_msi() call 



Fix the order to call pci_disable_msi() to be after free_irq().
(Otherwise pci_disable_msi() bugs you.)
Also, added a description of disable_msi option to documentation.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent cd417d4f

Documentation/sound/alsa/ALSA-Configuration.txt

+1 −0
Original line number Diff line number Diff line
@@ -758,6 +758,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. 
    position_fix - Fix DMA pointer (0 = auto, 1 = none, 2 = POSBUF, 3 = FIFO size)

    single_cmd  - Use single immediate commands to communicate with

		codecs (for debugging only)

    disable_msi - Disable Message Signaled Interrupt (MSI)



    This module supports one card and autoprobe.

sound/pci/hda/hda_intel.c

+2 −1
Original line number Diff line number Diff line
@@ -1422,8 +1422,9 @@ static int azx_free(struct azx *chip) 
	}



	if (chip->irq >= 0) {

		pci_disable_msi(chip->pci);

		free_irq(chip->irq, (void*)chip);

		if (!disable_msi)

			pci_disable_msi(chip->pci);

	}

	if (chip->remap_addr)

		iounmap(chip->remap_addr);