Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[powerpc.git] / drivers / pci / hotplug / rpaphp_core.c

diff --git a/drivers/pci/hotplug/rpaphp_core.c b/drivers/pci/hotplug/rpaphp_core.c
index c830ff0..cf075c3 100644 (file)
--- 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;