[PATCH v5 02/13] PCI: don't scan existing devices

From: Alex Chiang <achiang@hp.com>
To: jbarnes@virtuousgeek.org
Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
	Trent Piepho <xyzzy@speakeasy.org>, Alex Chiang <achiang@hp.com>
Subject: [PATCH v5 02/13] PCI: don't scan existing devices
Date: Fri, 20 Mar 2009 14:56:00 -0600	[thread overview]
Message-ID: <20090320205600.12275.69126.stgit@bob.kio> (raw)
In-Reply-To: <20090320204327.12275.43010.stgit@bob.kio>

From: Trent Piepho <xyzzy@speakeasy.org>

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>
---

 drivers/pci/probe.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 579a56c..b89a86e 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1013,6 +1013,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;

