PCI: Do not run NVidia quirks related to MSI with MSI disabled

Commit Message

Rafael Wysocki July 23, 2010, 8:19 p.m. UTC

None

Patch

Index: linux-2.6/drivers/pci/quirks.c
===================================================================
--- linux-2.6.orig/drivers/pci/quirks.c
+++ linux-2.6/drivers/pci/quirks.c
@@ -2390,6 +2390,9 @@  static void __devinit __nv_msi_ht_cap_qu
 	int pos;
 	int found;
 
+	if (!pci_msi_enabled())
+		return;
+
 	/* check if there is HT MSI cap or enabled on this device */
 	found = ht_check_msi_mapping(dev);