Commit 90bdb311 authored Mar 20, 2009 by Trent Piepho Committed by Jesse Barnes Mar 20, 2009

PCI: don't scan existing devices



pci_scan_single_device is supposed to add newly discovered
devices to pci_bus->devices, but doesn't check to see if the
device has already been added. This can cause problems if we ever
want to use this interface to rescan the PCI bus.

If the device is already added, just return it.

Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Alex Chiang <achiang@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>

parent 79af72d7

drivers/pci/probe.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -1019,6 +1019,12 @@ struct pci_dev __ref pci_scan_single_device(struct pci_bus bus, int devfn)
		{
		struct pci_dev *dev;

		dev = pci_get_slot(bus, devfn);
		if (dev) {
		pci_dev_put(dev);
		return dev;
		}

		dev = pci_scan_device(bus, devfn);
		if (!dev)
		return NULL;