aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/sound/alsa/ALSA-Configuration.txt1
-rw-r--r--sound/pci/hda/hda_intel.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt
index 1b749947233c..e6b57dd46a4f 100644
--- a/Documentation/sound/alsa/ALSA-Configuration.txt
+++ b/Documentation/sound/alsa/ALSA-Configuration.txt
@@ -758,6 +758,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed.
758 position_fix - Fix DMA pointer (0 = auto, 1 = none, 2 = POSBUF, 3 = FIFO size) 758 position_fix - Fix DMA pointer (0 = auto, 1 = none, 2 = POSBUF, 3 = FIFO size)
759 single_cmd - Use single immediate commands to communicate with 759 single_cmd - Use single immediate commands to communicate with
760 codecs (for debugging only) 760 codecs (for debugging only)
761 disable_msi - Disable Message Signaled Interrupt (MSI)
761 762
762 This module supports one card and autoprobe. 763 This module supports one card and autoprobe.
763 764
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index cc50d13ee90c..bfd74a526b85 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1422,8 +1422,9 @@ static int azx_free(struct azx *chip)
1422 } 1422 }
1423 1423
1424 if (chip->irq >= 0) { 1424 if (chip->irq >= 0) {
1425 pci_disable_msi(chip->pci);
1426 free_irq(chip->irq, (void*)chip); 1425 free_irq(chip->irq, (void*)chip);
1426 if (!disable_msi)
1427 pci_disable_msi(chip->pci);
1427 } 1428 }
1428 if (chip->remap_addr) 1429 if (chip->remap_addr)
1429 iounmap(chip->remap_addr); 1430 iounmap(chip->remap_addr);