diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-14 14:07:00 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-14 14:07:00 +0200 |
commit | 6e03f99803195e5aaf7f247db31b0d11857ccc35 (patch) | |
tree | ffd4b1a140854977e984a4390105333845c0e90c /drivers/pci/hotplug/fakephp.c | |
parent | 982162602b31041b426edec6480d327743abcbcc (diff) | |
parent | 6bfb09a1005193be5c81ebac9f3ef85210142650 (diff) |
Merge branch 'linus' into x86/iommu
Conflicts:
lib/swiotlb.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/pci/hotplug/fakephp.c')
-rw-r--r-- | drivers/pci/hotplug/fakephp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pci/hotplug/fakephp.c b/drivers/pci/hotplug/fakephp.c index 40337a06c18..146ca9cd156 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; |