1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index 3efb1296290d..49883c59756e 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -301,7 +301,10 @@ static int pcie_write_cmd(struct controller *ctrl, u16 cmd, u16 mask)
         }
 
         slot_ctrl &= ~mask;
-        slot_ctrl |= ((cmd & mask) | CMD_CMPL_INTR_ENABLE);
+        slot_ctrl |= (cmd & mask);
+        /* Don't enable command completed if caller is changing it. */
+        if (!(mask & CMD_CMPL_INTR_ENABLE))
+                slot_ctrl |= CMD_CMPL_INTR_ENABLE;
 
         ctrl->cmd_busy = 1;
         smp_mb();