From 79b437c77baad6b5e4a6d17f2b14e2bd30d1d174 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 10 Oct 2006 14:39:00 -0700 Subject: [PATCH] --- yaml --- r: 39903 b: refs/heads/master c: 11f242f04c6d886494cc83097cb6def044eabebb h: refs/heads/master i: 39901: 04904bd1ada7cd2ff77cedd6d5978454428ffe22 39899: 108a768ec14ec3d7064b7fdda8977f55ac6c8d3d 39895: 1dfaa162977d2e3c4fac0593bf23005824e6e30b 39887: e245577eb78888b613244b5aa4b4b4bbfb32d5e9 39871: b4866b1fc9c847c7f31042883d84a424203bdb42 v: v3 --- [refs] | 2 +- trunk/drivers/pci/quirks.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ad741aa607c6..fe2894e1caca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0cc2b3763e06e84ae5a90b63e03cc1d585a109d0 +refs/heads/master: 11f242f04c6d886494cc83097cb6def044eabebb diff --git a/trunk/drivers/pci/quirks.c b/trunk/drivers/pci/quirks.c index 371ab8821f10..e8a7f1b1b2bc 100644 --- a/trunk/drivers/pci/quirks.c +++ b/trunk/drivers/pci/quirks.c @@ -1840,7 +1840,7 @@ static void __devinit quirk_nvidia_ck804_msi_ht_cap(struct pci_dev *dev) /* check HT MSI cap on this chipset and the root one. * a single one having MSI is enough to be sure that MSI are supported. */ - pdev = pci_find_slot(dev->bus->number, 0); + pdev = pci_get_slot(dev->bus, 0); if (dev->subordinate && !msi_ht_cap_enabled(dev) && !msi_ht_cap_enabled(pdev)) { printk(KERN_WARNING "PCI: MSI quirk detected. " @@ -1848,6 +1848,7 @@ static void __devinit quirk_nvidia_ck804_msi_ht_cap(struct pci_dev *dev) pci_name(dev)); dev->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MSI; } + pci_dev_put(pdev); } DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_CK804_PCIE, quirk_nvidia_ck804_msi_ht_cap);