From 40c3393c43f0bba71d1386eb08a5ef3efa6598b4 Mon Sep 17 00:00:00 2001
From: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Date: Mon, 13 Nov 2006 15:13:09 -0800
Subject: [PATCH] --- yaml --- r: 41231 b: refs/heads/master c:
 9d167dc367f22c07285137370816b83b4be9c697 h: refs/heads/master i:   41229:
 1a01591d15d48e263a505a29b2b8d0467950daed   41227:
 3a4e9db0fe87b93d185565ede1b5483ec186fac4   41223:
 996203dd85bc886dcc8f16e914cdd14ba42a8a5d   41215:
 a7d6345be37d5de5deb4e758515d4f7b7975d42c v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/pci/hotplug/pciehp_hpc.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 30d48e95e303..850056336a2e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 407f452b05f9e5d019c07077d05238bca1b45c4c
+refs/heads/master: 9d167dc367f22c07285137370816b83b4be9c697
diff --git a/trunk/drivers/pci/hotplug/pciehp_hpc.c b/trunk/drivers/pci/hotplug/pciehp_hpc.c
index 1c551c697c35..6d3f580f2666 100644
--- a/trunk/drivers/pci/hotplug/pciehp_hpc.c
+++ b/trunk/drivers/pci/hotplug/pciehp_hpc.c
@@ -718,8 +718,6 @@ static void hpc_release_ctlr(struct controller *ctrl)
 		if (php_ctlr->irq) {
 			free_irq(php_ctlr->irq, ctrl);
 			php_ctlr->irq = 0;
-			if (!pcie_mch_quirk) 
-				pci_disable_msi(php_ctlr->pci_dev);
 		}
 	}
 	if (php_ctlr->pci_dev)