---

yaml --- r: 109819 b: refs/heads/master c: 4890202 h: refs/heads/master i: 109817: 8fb6751 109815: 4168cbf v: v3
git-mirror · Sep 9, 2008 · 984591e · 984591e
1 parent 68361cc
commit 984591e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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;