From 9f07178ded9e96186b3a85bda74e2f83b1c04f21 Mon Sep 17 00:00:00 2001 From: Alexander Winkowski Date: Sat, 10 May 2025 05:38:37 +0000 Subject: [PATCH] Revert "usb: dwc3: Increase DWC3 controller halt timeout" This reverts commit 935e842f982496f8ded14f006497def789f2763d. Reason for revert: dwc3_gadget_run_stop() is called from atomic context, it's wrong to use usleep_range() there. Change-Id: I5e25f2c1c9de0bba4b28157b6d42ef62f6706dfc Signed-off-by: Alexander Winkowski --- drivers/usb/dwc3/gadget.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index e9b8ec671071..b247497c992c 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -2389,7 +2389,7 @@ done: static int dwc3_gadget_run_stop(struct dwc3 *dwc, int is_on, int suspend) { u32 reg, reg1; - u32 timeout = 2000; + u32 timeout = 1500; u32 saved_config = 0; dbg_event(0xFF, "run_stop", is_on); @@ -2491,7 +2491,6 @@ static int dwc3_gadget_run_stop(struct dwc3 *dwc, int is_on, int suspend) } do { - usleep_range(1000, 2000); reg = dwc3_readl(dwc->regs, DWC3_DSTS); reg &= DWC3_DSTS_DEVCTRLHLT; } while (--timeout && !(!is_on ^ !reg));