From 965f8c3f66347e3d433cb81c7230bd82599752b7 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Fri, 23 Jul 2010 22:19:55 +0200
Subject: [PATCH] --- yaml --- r: 206110 b: refs/heads/master c:
 3d2a531804d16cd8df6dbbb0429c6f143e756049 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/pci/quirks.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 9c0b2bdb75f3..6f7b1feed047 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1f7979ac53224b0208e7d3eaeb5fd72ab9687389
+refs/heads/master: 3d2a531804d16cd8df6dbbb0429c6f143e756049
diff --git a/trunk/drivers/pci/quirks.c b/trunk/drivers/pci/quirks.c
index 8141f442e3df..a1682f19bcb0 100644
--- a/trunk/drivers/pci/quirks.c
+++ b/trunk/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);