diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index b3b5df6dcbd2..9b9367b22ad3 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -1581,10 +1581,10 @@ static int dwc3_gadget_run_stop(struct dwc3 *dwc, int is_on, int suspend)
 			if (reg & DWC3_DSTS_DEVCTRLHLT)
 				break;
 		}
-		timeout--;
-		if (!timeout)
-			return -ETIMEDOUT;
-	} while (1);
+	} while (--timeout);
+
+	if (!timeout)
+		return -ETIMEDOUT;
 
 	dwc3_trace(trace_dwc3_gadget, "gadget %s data soft-%s",
 			dwc->gadget_driver