From patchwork Tue Jun 2 15:25:27 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Chiang X-Patchwork-Id: 27516 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n52FQBnO013116 for ; Tue, 2 Jun 2009 15:26:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757917AbZFBPZ2 (ORCPT ); Tue, 2 Jun 2009 11:25:28 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757948AbZFBPZ1 (ORCPT ); Tue, 2 Jun 2009 11:25:27 -0400 Received: from g1t0027.austin.hp.com ([15.216.28.34]:8158 "EHLO g1t0027.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758028AbZFBPZY (ORCPT ); Tue, 2 Jun 2009 11:25:24 -0400 Received: from smtp1.fc.hp.com (smtp1.fc.hp.com [15.15.136.127]) by g1t0027.austin.hp.com (Postfix) with ESMTP id 47EB238076; Tue, 2 Jun 2009 15:25:27 +0000 (UTC) Received: from localhost.localdomain (lart.fc.hp.com [15.11.146.31]) by smtp1.fc.hp.com (Postfix) with ESMTP id D3CD9254371; Tue, 2 Jun 2009 14:51:02 +0000 (UTC) Received: from bob.kio (localhost [127.0.0.1]) by localhost.localdomain (Postfix) with ESMTP id 140F626142; Tue, 2 Jun 2009 09:25:27 -0600 (MDT) Subject: [PATCH 10/10] ACPI: acpi_pci_unbind should clean up properly after acpi_pci_bind To: lenb@kernel.org From: Alex Chiang Cc: linux-acpi@vger.kernel.org, Bjorn Helgaas , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org Date: Tue, 02 Jun 2009 09:25:27 -0600 Message-ID: <20090602152527.7346.97494.stgit@bob.kio> In-Reply-To: <20090602152351.7346.48697.stgit@bob.kio> References: <20090602152351.7346.48697.stgit@bob.kio> User-Agent: StGit/0.14.3.347.g594a MIME-Version: 1.0 Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org In acpi_pci_bind, we add _PRT information for non-bridge devices, but we never delete that information in acpi_pci_unbind. We also set device->ops.bind and device->ops.unbind, but never clear them out. Let's make acpi_pci_unbind clean up what we did in acpi_pci_bind. Cc: Bjorn Helgaas Signed-off-by: Alex Chiang --- drivers/acpi/pci_bind.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/acpi/pci_bind.c b/drivers/acpi/pci_bind.c index 9185b54..c507e37 100644 --- a/drivers/acpi/pci_bind.c +++ b/drivers/acpi/pci_bind.c @@ -120,14 +120,21 @@ EXPORT_SYMBOL_GPL(acpi_get_pci_dev); static int acpi_pci_unbind(struct acpi_device *device) { + struct pci_bus *bus; struct pci_dev *dev; dev = acpi_get_pci_dev(device->handle); if (!dev) return 0; - if (dev->subordinate) - acpi_pci_irq_del_prt(dev->subordinate); + if (dev->subordinate) { + bus = dev->subordinate; + device->ops.bind = NULL; + device->ops.unbind = NULL; + } else + bus = dev->bus; + + acpi_pci_irq_del_prt(bus); return 0; }