1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c
index d6bfc73dedbd..2f51de57593a 100644
--- a/drivers/usb/dwc3/ep0.c
+++ b/drivers/usb/dwc3/ep0.c
@@ -165,10 +165,13 @@ static int __dwc3_gadget_ep0_queue(struct dwc3_ep *dep,
                                 req->request.dma, req->request.length, type);
                 dep->flags &= ~(DWC3_EP_PENDING_REQUEST |
                                 DWC3_EP0_DIR_IN);
-
-        } else if (dwc->delayed_status && (dwc->ep0state == EP0_STATUS_PHASE)) {
+        } else if (dwc->delayed_status) {
                 dwc->delayed_status = false;
-                dwc3_ep0_do_control_status(dwc, 1);
+
+                if (dwc->ep0state == EP0_STATUS_PHASE)
+                        dwc3_ep0_do_control_status(dwc, 1);
+                else
+                        dev_dbg(dwc->dev, "too early for delayed status\n");
         }
 
         return ret;