Merge branch 'for-rmk' of git://source.mvista.com/git/linux-davinci-2.6.git

Merge branch 'davinci' into devel

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/pci/hotplug/fakephp.c b/drivers/pci/hotplug/fakephp.c
index 40337a06c18a..146ca9cd1567 100644
--- a/drivers/pci/hotplug/fakephp.c
+++ b/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;