1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index 7c2a9dd6f6a4..b3e700d2a7f7 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -168,6 +168,9 @@ static void pcie_write_cmd(struct controller *ctrl, u16 cmd, u16 mask)
 
         mutex_lock(&ctrl->ctrl_lock);
 
+        /* Wait for any previous command that might still be in progress */
+        pcie_wait_cmd(ctrl);
+
         pcie_capability_read_word(pdev, PCI_EXP_SLTSTA, &slot_status);
         if (slot_status & PCI_EXP_SLTSTA_CC) {
                 pcie_capability_write_word(pdev, PCI_EXP_SLTSTA,
@@ -200,10 +203,6 @@ static void pcie_write_cmd(struct controller *ctrl, u16 cmd, u16 mask)
         pcie_capability_write_word(pdev, PCI_EXP_SLTCTL, slot_ctrl);
         ctrl->slot_ctrl = slot_ctrl;
 
-        /*
-         * Wait for command completion.
-         */
-        pcie_wait_cmd(ctrl);
         mutex_unlock(&ctrl->ctrl_lock);
 }