Re: [PATCH] PCI fixes for 2.6.9

[Greg KH]

ChangeSet 1.1997.37.47, 2004/10/06 13:44:01-07:00, dlsy@xxxxxxxxxxxxxxxxxxxxxxx

[PATCH] PCI: Hot-plug driver updates due to MSI change

In kernel 2.6.8, MSI has been updated.  This patch updates the two
hot-plug drivers to call pci_disable_msi() per MSI change to undo the
effect of pci_enable_msi() when the driver is unloading.

Signed-off-by: Dely Sy <dely.l.sy@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <greg@xxxxxxxxx>


 drivers/pci/hotplug/pciehp_hpc.c |    2 ++
 drivers/pci/hotplug/shpchp_hpc.c |    1 +
 2 files changed, 3 insertions(+)


diff -Nru a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
--- a/drivers/pci/hotplug/pciehp_hpc.c	2004-10-19 15:23:23 -07:00
+++ b/drivers/pci/hotplug/pciehp_hpc.c	2004-10-19 15:23:23 -07:00
@@ -741,6 +741,8 @@
 		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) 
diff -Nru a/drivers/pci/hotplug/shpchp_hpc.c b/drivers/pci/hotplug/shpchp_hpc.c
--- a/drivers/pci/hotplug/shpchp_hpc.c	2004-10-19 15:23:23 -07:00
+++ b/drivers/pci/hotplug/shpchp_hpc.c	2004-10-19 15:23:23 -07:00
@@ -792,6 +792,7 @@
 		if (php_ctlr->irq) {
 			free_irq(php_ctlr->irq, ctrl);
 			php_ctlr->irq = 0;
+			pci_disable_msi(php_ctlr->pci_dev);
 		}
 	}
 	if (php_ctlr->pci_dev) {

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/