From c3927346aae8ee32343940844513a1ab9b1b0729 Mon Sep 17 00:00:00 2001 From: David Rientjes Date: Sun, 3 Dec 2006 11:55:34 -0800 Subject: [PATCH] --- yaml --- r: 44805 b: refs/heads/master c: 0c875c28649eac0adb8d2e2efac2186c3089e100 h: refs/heads/master i: 44803: 1498712c05170cef2dca035af5915f793fb814a7 v: v3 --- [refs] | 2 +- trunk/drivers/pci/quirks.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d98d2f9f4fc7..d37526b9e5ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 42a0ee3238a0adb4c5bea3bd5b201c297b476e66 +refs/heads/master: 0c875c28649eac0adb8d2e2efac2186c3089e100 diff --git a/trunk/drivers/pci/quirks.c b/trunk/drivers/pci/quirks.c index 9ca9b9bf6160..757186390d83 100644 --- a/trunk/drivers/pci/quirks.c +++ b/trunk/drivers/pci/quirks.c @@ -1688,8 +1688,7 @@ 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 (dev->subordinate && !msi_ht_cap_enabled(dev) - && !msi_ht_cap_enabled(pdev)) { + if (!msi_ht_cap_enabled(dev) && !msi_ht_cap_enabled(pdev)) { printk(KERN_WARNING "PCI: MSI quirk detected. " "MSI disabled on chipset %s.\n", pci_name(dev));