From 4a983484cae755477cebb6c7c69cdebe7d441f55 Mon Sep 17 00:00:00 2001
From: Alexander Chiang <achiang@hp.com>
Date: Wed, 10 Jun 2009 19:55:45 +0000
Subject: [PATCH] --- yaml --- r: 154149 b: refs/heads/master c:
 97719a8726fe8d3ea12a85fbf4f514a915ba30ec h: refs/heads/master i:   154147:
 e00ca72e7a3f37b7d5eea0b9f6ee68b8956d55ae v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/acpi/pci_bind.c | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e3b29aca2ae4..ede9ce48d02c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9efae3688addb15994c9ad9761dada6f988bc14
+refs/heads/master: 97719a8726fe8d3ea12a85fbf4f514a915ba30ec
diff --git a/trunk/drivers/acpi/pci_bind.c b/trunk/drivers/acpi/pci_bind.c
index 62cb383222f8..a205769f1d00 100644
--- a/trunk/drivers/acpi/pci_bind.c
+++ b/trunk/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;
 }