Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758925AbZCRWki (ORCPT ); Wed, 18 Mar 2009 18:40:38 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756915AbZCRWjj (ORCPT ); Wed, 18 Mar 2009 18:39:39 -0400 Received: from g4t0015.houston.hp.com ([15.201.24.18]:45542 "EHLO g4t0015.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755604AbZCRWjh (ORCPT ); Wed, 18 Mar 2009 18:39:37 -0400 From: Alex Chiang Subject: [PATCH v4 02/12] PCI: don't scan existing devices To: jbarnes@virtuousgeek.org Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Trent Piepho , Alex Chiang Date: Wed, 18 Mar 2009 16:39:35 -0600 Message-ID: <20090318223935.887.22661.stgit@bob.kio> In-Reply-To: <20090318222426.887.1008.stgit@bob.kio> References: <20090318222426.887.1008.stgit@bob.kio> User-Agent: StGIT/0.14.3.215.gff3d MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1178 Lines: 39 From: Trent Piepho 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 Signed-off-by: Alex Chiang --- 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 55ec44a..66b5d1c 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1006,6 +1006,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; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/