From patchwork Wed Jun 10 19:55:45 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Chiang X-Patchwork-Id: 29377 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 n5AJvd4c003381 for ; Wed, 10 Jun 2009 19:57:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761500AbZFJTzr (ORCPT ); Wed, 10 Jun 2009 15:55:47 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1761406AbZFJTzq (ORCPT ); Wed, 10 Jun 2009 15:55:46 -0400 Received: from g1t0027.austin.hp.com ([15.216.28.34]:47578 "EHLO g1t0027.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761471AbZFJTzn (ORCPT ); Wed, 10 Jun 2009 15:55:43 -0400 Received: from smtp1.fc.hp.com (smtp.cnd.hp.com [15.15.136.127]) by g1t0027.austin.hp.com (Postfix) with ESMTP id D40BC3871D; Wed, 10 Jun 2009 19:55:45 +0000 (UTC) Received: from localhost.localdomain (lart.fc.hp.com [15.11.146.31]) by smtp1.fc.hp.com (Postfix) with ESMTP id 81FB3255225; Wed, 10 Jun 2009 19:20:43 +0000 (UTC) Received: from bob.kio (localhost [127.0.0.1]) by localhost.localdomain (Postfix) with ESMTP id 878122615B; Wed, 10 Jun 2009 13:55:45 -0600 (MDT) Subject: [PATCH v3 08/12] 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: Wed, 10 Jun 2009 13:55:45 -0600 Message-ID: <20090610195545.28982.31987.stgit@bob.kio> In-Reply-To: <20090610194714.28982.51363.stgit@bob.kio> References: <20090610194714.28982.51363.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 set device->ops.bind and device->ops.unbind, but never clear them out. Cc: Bjorn Helgaas Signed-off-by: Alex Chiang --- drivers/acpi/pci_bind.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 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 62cb383..a205769 100644 --- a/drivers/acpi/pci_bind.c +++ b/drivers/acpi/pci_bind.c @@ -109,12 +109,15 @@ static int acpi_pci_unbind(struct acpi_device *device) struct pci_dev *dev; dev = acpi_get_pci_dev(device->handle); - if (!dev) - return 0; + if (!dev || !dev->subordinate) + goto out; - if (dev->subordinate) - acpi_pci_irq_del_prt(dev->subordinate); + acpi_pci_irq_del_prt(dev->subordinate); + + device->ops.bind = NULL; + device->ops.unbind = NULL; +out: pci_dev_put(dev); return 0; }