From 984591ec1d06f53b0984f5b3c58b5a5b37f9425d Mon Sep 17 00:00:00 2001
From: Alex Chiang <achiang@hp.com>
Date: Fri, 5 Sep 2008 14:05:03 -0700
Subject: [PATCH] --- yaml --- r: 109819 b: refs/heads/master c:
 48902025af4da44dbbc0231061e542d6d40e712e h: refs/heads/master i:   109817:
 8fb67510c215f76daab148a0d3bdc9279e02e158   109815:
 4168cbfe53c556fa9bbef352d3861862dacddd71 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/pci/hotplug/fakephp.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 79eb031ed49d..df91cc239352 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53bc88701be91e7f631ad31418b32392aa952e9b
+refs/heads/master: 48902025af4da44dbbc0231061e542d6d40e712e
diff --git a/trunk/drivers/pci/hotplug/fakephp.c b/trunk/drivers/pci/hotplug/fakephp.c
index 40337a06c18a..146ca9cd1567 100644
--- a/trunk/drivers/pci/hotplug/fakephp.c
+++ b/trunk/drivers/pci/hotplug/fakephp.c
@@ -320,15 +320,15 @@ static int disable_slot(struct hotplug_slot *slot)
 			return -ENODEV;
 		}
 
+		/* remove the device from the pci core */
+		pci_remove_bus_device(dev);
+
 		/* queue work item to blow away this sysfs entry and other
 		 * parts.
 		 */
 		INIT_WORK(&dslot->remove_work, remove_slot_worker);
 		queue_work(dummyphp_wq, &dslot->remove_work);
 
-		/* blow away this sysfs entry and other parts. */
-		remove_slot(dslot);
-
 		pci_dev_put(dev);
 	}
 	return 0;