From 2e8fc9072a3996fa83bd89e52e79e7685513eea3 Mon Sep 17 00:00:00 2001
From: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>
Date: Tue, 12 Sep 2006 10:17:46 -0700
Subject: [PATCH] --- yaml --- r: 36080 b: refs/heads/master c:
 0dad3510ee82bcf8a380b81a2184a664a911ef9c h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/pci/hotplug/acpiphp_glue.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 39bae24a8d55..98c212ab7a66 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 24f8aa9b464b73e0553f092b747770940ee0ea54
+refs/heads/master: 0dad3510ee82bcf8a380b81a2184a664a911ef9c
diff --git a/trunk/drivers/pci/hotplug/acpiphp_glue.c b/trunk/drivers/pci/hotplug/acpiphp_glue.c
index c1001ad81ad4..d36732cd4bad 100644
--- a/trunk/drivers/pci/hotplug/acpiphp_glue.c
+++ b/trunk/drivers/pci/hotplug/acpiphp_glue.c
@@ -1129,6 +1129,9 @@ static int disable_device(struct acpiphp_slot *slot)
 			func->bridge = NULL;
 		}
 
+		if (func->pci_dev)
+			pci_stop_bus_device(func->pci_dev);
+
 		acpiphp_bus_trim(func->handle);
 		/* try to remove anyway.
 		 * acpiphp_bus_add might have been failed */