Merge branch 'pci/pm' into next

[linux] / drivers / pci / hotplug / pciehp_ctrl.c

diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
index ffd3fe6..10c9c0b 100644 (file)
--- a/drivers/pci/hotplug/pciehp_ctrl.c
+++ b/drivers/pci/hotplug/pciehp_ctrl.c
@@ -416,7 +416,7 @@ int pciehp_enable_slot(struct slot *p_slot)
                if (getstatus) {
                        ctrl_info(ctrl, "Slot(%s): Already enabled\n",
                                  slot_name(p_slot));
-                       return -EINVAL;
+                       return 0;
                }
        }