[PATCH] [UBUNTU:sound/pci/hda/] One more inverted-call-order fix for pci_disable_msi()

[crimsun at fungus.sh.nu]

From 02d3716bd6de7a63a18dd08db7d26d749468b371 Mon Sep 17 00:00:00 2001
From: Daniel T. Chen <crimsun at garnish.localdomain>
Date: Sat, 7 Oct 2006 21:53:13 -0400
Subject: [PATCH] [UBUNTU:sound/pci/hda/] One more inverted-call-order fix for pci_disable_msi()

UpstreamStatus: Added in upstream alsa-kernel hg changeset:
		4f27a5064cda [http://hg-mirror.alsa-project.org/alsa-kernel?cmd=changeset;node=4f27a5064cda31704d149df3e761b7faec8aea4c;style=raw]

This commit from Takashi Iwai avoids a bug where pci_disable_msi()
was called before free_irq().

This commit is applicable to both Dapper and Edgy linux-source.

Signed-off-by: Daniel T Chen <crimsun at ubuntu.com>
---
 sound/pci/hda/hda_intel.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 7897fd3..8839c70 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -1414,8 +1414,9 @@ static int azx_free(azx_t *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);
-- 
1.4.1


-- 
Daniel T. Chen            crimsun at ubuntu.com
GPG key:  0xC88ABDA3
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20061007/db01a3c2/attachment.sig>