diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-13 14:47:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-13 14:47:33 -0700 |
| commit | 0cb60efd03ed82d02f44a14594714367e59e8abc (patch) | |
| tree | 23d9443331673a75e296781031f652e3e87687cc /drivers/pci/hotplug/fakephp.c | |
| parent | c19e80808b34b3de5c20884f11f58c3b6988daff (diff) | |
| parent | 395a125c6237802b19bf22b41017c99ff57f1024 (diff) | |
| download | op-kernel-dev-0cb60efd03ed82d02f44a14594714367e59e8abc.zip op-kernel-dev-0cb60efd03ed82d02f44a14594714367e59e8abc.tar.gz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCI: re-add debug prints for unmodified BARs
PCI: fix pciehp_free_irq()
PCI Hotplug: fakephp: fix deadlock... again
PCI: Fix printk warnings in setup-bus.c
PCI: Fix printk warnings in probe.c
PCI/iommu: blacklist DMAR on Intel G31/G33 chipsets
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 40337a0..146ca9c 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; |
