From: Greg Kroah-Hartman gregkh@linuxfoundation.org
commit 664cc971fb259007e49cc8a3ac43b0787d89443f upstream.
This reverts commit d25d85061bd856d6be221626605319154f9b5043 as it is reported to cause problems on many different types of boards.
Reported-by: Thinh Nguyen Thinh.Nguyen@synopsys.com Reported-by: John Stultz john.stultz@linaro.org Cc: Ray Chi raychi@google.com Link: https://lore.kernel.org/r/CANcMJZCEVxVLyFgLwK98hqBEdc0_n4P0x_K6Gih8zNH3ouzbJ... Fixes: d25d85061bd8 ("usb: dwc3: gadget: Use list_replace_init() before traversing lists") Cc: stable stable@vger.kernel.org Cc: Felipe Balbi balbi@kernel.org Cc: Wesley Cheng wcheng@codeaurora.org Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- drivers/usb/dwc3/gadget.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-)
--- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -1741,13 +1741,9 @@ static void dwc3_gadget_ep_cleanup_cance { struct dwc3_request *req; struct dwc3_request *tmp; - struct list_head local; struct dwc3 *dwc = dep->dwc;
-restart: - list_replace_init(&dep->cancelled_list, &local); - - list_for_each_entry_safe(req, tmp, &local, list) { + list_for_each_entry_safe(req, tmp, &dep->cancelled_list, list) { dwc3_gadget_ep_skip_trbs(dep, req); switch (req->status) { case DWC3_REQUEST_STATUS_DISCONNECTED: @@ -1765,9 +1761,6 @@ restart: break; } } - - if (!list_empty(&dep->cancelled_list)) - goto restart; }
static int dwc3_gadget_ep_dequeue(struct usb_ep *ep, @@ -2963,12 +2956,8 @@ static void dwc3_gadget_ep_cleanup_compl { struct dwc3_request *req; struct dwc3_request *tmp; - struct list_head local;
-restart: - list_replace_init(&dep->started_list, &local); - - list_for_each_entry_safe(req, tmp, &local, list) { + list_for_each_entry_safe(req, tmp, &dep->started_list, list) { int ret;
ret = dwc3_gadget_ep_cleanup_completed_request(dep, event, @@ -2976,9 +2965,6 @@ restart: if (ret) break; } - - if (!list_empty(&dep->started_list)) - goto restart; }
static bool dwc3_gadget_ep_should_continue(struct dwc3_ep *dep)