diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 15:57:32 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-28 15:57:32 -0700 |
| commit | 7efe5d7c3e3a82e43b0f8fb29c6797317bce7a9a (patch) | |
| tree | 2e246004dfc130947574e340a4968239b3f2d20b /drivers/pci/hotplug/rpaphp_core.c | |
| parent | dbe0580d0d2fccf63b0349840a7ae3dbb16f3074 (diff) | |
| parent | f8977d0a9b7ac84cfe700278a2ca64cb33c93a13 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'drivers/pci/hotplug/rpaphp_core.c')
| -rw-r--r-- | drivers/pci/hotplug/rpaphp_core.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c index c830ff0acdc..cf075c34b57 100644 --- a/drivers/pci/hotplug/rpaphp_core.c +++ b/drivers/pci/hotplug/rpaphp_core.c @@ -426,8 +426,11 @@ static int disable_slot(struct hotplug_slot *hotplug_slot) dbg("DISABLING SLOT %s\n", slot->name); down(&rpaphp_sem); - retval = rpaphp_unconfig_pci_adapter(slot); + retval = rpaphp_unconfig_pci_adapter(slot->bus); up(&rpaphp_sem); + slot->state = NOT_CONFIGURED; + info("%s: devices in slot[%s] unconfigured.\n", __FUNCTION__, + slot->name); exit: dbg("%s - Exit: rc[%d]\n", __FUNCTION__, retval); return retval; |