diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2006-12-07 02:14:03 +0100 |
|---|---|---|
| committer | Andi Kleen <andi@basil.nowhere.org> | 2006-12-07 02:14:03 +0100 |
| commit | 7cd8b6861eb586aabe4c725cc0c259ce2e653695 (patch) | |
| tree | 499bf7f9e266098edda8f988bdef0c86263cb097 /arch/i386/pci | |
| parent | 72690a21188586022a9e65cb6f1cc8845167555a (diff) | |
| download | op-kernel-dev-7cd8b6861eb586aabe4c725cc0c259ce2e653695.zip op-kernel-dev-7cd8b6861eb586aabe4c725cc0c259ce2e653695.tar.gz | |
[PATCH] x86: remove last two pci_find offenders in the core code
Resending as I believe the discussion about them established they were
correct.
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Diffstat (limited to 'arch/i386/pci')
| -rw-r--r-- | arch/i386/pci/irq.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/i386/pci/irq.c b/arch/i386/pci/irq.c index e65551c..f2cb942 100644 --- a/arch/i386/pci/irq.c +++ b/arch/i386/pci/irq.c @@ -764,7 +764,7 @@ static void __init pirq_find_router(struct irq_router *r) DBG(KERN_DEBUG "PCI: Attempting to find IRQ router for %04x:%04x\n", rt->rtr_vendor, rt->rtr_device); - pirq_router_dev = pci_find_slot(rt->rtr_bus, rt->rtr_devfn); + pirq_router_dev = pci_get_bus_and_slot(rt->rtr_bus, rt->rtr_devfn); if (!pirq_router_dev) { DBG(KERN_DEBUG "PCI: Interrupt router not found at " "%02x:%02x\n", rt->rtr_bus, rt->rtr_devfn); @@ -784,6 +784,8 @@ static void __init pirq_find_router(struct irq_router *r) pirq_router_dev->vendor, pirq_router_dev->device, pci_name(pirq_router_dev)); + + /* The device remains referenced for the kernel lifetime */ } static struct irq_info *pirq_get_info(struct pci_dev *dev) |
