Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753941AbZCIFtt (ORCPT ); Mon, 9 Mar 2009 01:49:49 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752777AbZCIFst (ORCPT ); Mon, 9 Mar 2009 01:48:49 -0400 Received: from g5t0007.atlanta.hp.com ([15.192.0.44]:43813 "EHLO g5t0007.atlanta.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752746AbZCIFsr (ORCPT ); Mon, 9 Mar 2009 01:48:47 -0400 From: Alex Chiang Subject: [PATCH v3 02/11] 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: Sun, 08 Mar 2009 23:48:45 -0600 Message-ID: <20090309054845.3918.92604.stgit@bob.kio> In-Reply-To: <20090309052933.3918.86601.stgit@bob.kio> References: <20090309052933.3918.86601.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/