diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 4cb69e0af83442230fc13448a3e31f5b144ebe86..492a61c2c79d496f8bf1673489203dbb7edd5bb3 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -1173,6 +1173,7 @@ static int xhci_configure_endpoint(struct xhci_hcd *xhci,
 		cmd_completion = &virt_dev->cmd_completion;
 		cmd_status = &virt_dev->cmd_status;
 	}
+	init_completion(cmd_completion);
 
 	if (!ctx_change)
 		ret = xhci_queue_configure_endpoint(xhci, in_ctx->dma,