2 files changed, 7 insertions, 12 deletions

diff --git a/drivers/pci/hotplug/pciehp_ctrl.c b/drivers/pci/hotplug/pciehp_ctrl.c
index 4cb2c623e17b..b23061c56115 100644
--- a/drivers/pci/hotplug/pciehp_ctrl.c
+++ b/drivers/pci/hotplug/pciehp_ctrl.c
@@ -195,12 +195,6 @@ static void set_slot_off(struct controller *ctrl, struct slot * pslot)
                             __FUNCTION__);
                         return;
                 }
-                /*
-                 * After turning power off, we must wait for at least
-                 * 1 second before taking any action that relies on
-                 * power having been removed from the slot/adapter.
-                 */
-                msleep(1000);
         }
 }
 
@@ -610,12 +604,6 @@ int pciehp_disable_slot(struct slot *p_slot)
                         mutex_unlock(&p_slot->ctrl->crit_sect);
                         return -EINVAL;
                 }
-                /*
-                 * After turning power off, we must wait for at least
-                 * 1 second before taking any action that relies on
-                 * power having been removed from the slot/adapter.
-                 */
-                msleep(1000);
         }
 
         ret = remove_board(p_slot);
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index 8c2d6c9b92c5..b2cde04ede1a 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -674,6 +674,13 @@ static int hpc_power_off_slot(struct slot * slot)
         dbg("%s: SLOTCTRL %x write cmd %x\n",
             __FUNCTION__, ctrl->cap_base + SLOTCTRL, slot_cmd);
 
+        /*
+         * After turning power off, we must wait for at least 1 second
+         * before taking any action that relies on power having been
+         * removed from the slot/adapter.
+         */
+        msleep(1000);
+
         return retval;
 }