summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2006-09-07 12:40:00 +0200
committerJaroslav Kysela <perex@suse.cz>2006-09-23 10:46:42 +0200
commitdafbbb1fdbf103b24d0f7aa645625b6bd558c896 (patch)
tree889cc11043b4f3edd06a1aa8a0089aa06249eb36 /sound
parentcd417d4fe89638a2848980cb389b9781d4913173 (diff)
downloadlinux-3.10-dafbbb1fdbf103b24d0f7aa645625b6bd558c896.tar.gz
linux-3.10-dafbbb1fdbf103b24d0f7aa645625b6bd558c896.tar.bz2
linux-3.10-dafbbb1fdbf103b24d0f7aa645625b6bd558c896.zip
[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: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/hda_intel.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index cc50d13ee90..bfd74a526b8 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)
}
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);