From fee50b5293c8e77b62ac07a37a76538ffb098187 Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jesper.juhl@gmail.com>
Date: Mon, 4 Dec 2006 15:14:48 -0800
Subject: [PATCH] --- yaml --- r: 44816 b: refs/heads/master c:
 9ac0ce8596b17093739d42721cc8a616cedf734b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 44dfe3574d93..29de0070bb2b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1597cacbe39802d86656d1f2e6329895bd2ef531
+refs/heads/master: 9ac0ce8596b17093739d42721cc8a616cedf734b
diff --git a/trunk/drivers/pci/quirks.c b/trunk/drivers/pci/quirks.c
index 30c41fc1c996..8a2db01b903e 100644
--- a/trunk/drivers/pci/quirks.c
+++ b/trunk/drivers/pci/quirks.c
@@ -1743,6 +1743,8 @@ static void __devinit quirk_nvidia_ck804_msi_ht_cap(struct pci_dev *dev)
 	 * a single one having MSI is enough to be sure that MSI are supported.
 	 */
 	pdev = pci_get_slot(dev->bus, 0);
+	if (!pdev)
+		return;
 	if (!msi_ht_cap_enabled(dev) && !msi_ht_cap_enabled(pdev)) {
 		printk(KERN_WARNING "PCI: MSI quirk detected. "
 		       "MSI disabled on chipset %s.\n",