diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index 8141f442e3dfa0ea36c2e4e2f20e0596eb56d344..a1682f19bcb0d83890917f4bdf1a4a1f46cd2673 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -2421,6 +2421,9 @@ static void __devinit __nv_msi_ht_cap_quirk(struct pci_dev *dev, int all)
 	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);