Commit 664cc971 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

Revert "usb: dwc3: gadget: Use list_replace_init() before traversing lists"

This reverts commit d25d8506 as it is
reported to cause problems on many different types of boards.
Reported-by: default avatarThinh Nguyen <Thinh.Nguyen@synopsys.com>
Reported-by: default avatarJohn Stultz <john.stultz@linaro.org>
Cc: Ray Chi <raychi@google.com>
Link: https://lore.kernel.org/r/CANcMJZCEVxVLyFgLwK98hqBEdc0_n4P0x_K6Gih8zNH3ouzbJQ@mail.gmail.com
Fixes: d25d8506 ("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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 36a21d51
...@@ -1741,13 +1741,9 @@ static void dwc3_gadget_ep_cleanup_cancelled_requests(struct dwc3_ep *dep) ...@@ -1741,13 +1741,9 @@ static void dwc3_gadget_ep_cleanup_cancelled_requests(struct dwc3_ep *dep)
{ {
struct dwc3_request *req; struct dwc3_request *req;
struct dwc3_request *tmp; struct dwc3_request *tmp;
struct list_head local;
struct dwc3 *dwc = dep->dwc; struct dwc3 *dwc = dep->dwc;
restart: list_for_each_entry_safe(req, tmp, &dep->cancelled_list, list) {
list_replace_init(&dep->cancelled_list, &local);
list_for_each_entry_safe(req, tmp, &local, list) {
dwc3_gadget_ep_skip_trbs(dep, req); dwc3_gadget_ep_skip_trbs(dep, req);
switch (req->status) { switch (req->status) {
case DWC3_REQUEST_STATUS_DISCONNECTED: case DWC3_REQUEST_STATUS_DISCONNECTED:
...@@ -1765,9 +1761,6 @@ static void dwc3_gadget_ep_cleanup_cancelled_requests(struct dwc3_ep *dep) ...@@ -1765,9 +1761,6 @@ static void dwc3_gadget_ep_cleanup_cancelled_requests(struct dwc3_ep *dep)
break; break;
} }
} }
if (!list_empty(&dep->cancelled_list))
goto restart;
} }
static int dwc3_gadget_ep_dequeue(struct usb_ep *ep, static int dwc3_gadget_ep_dequeue(struct usb_ep *ep,
...@@ -2976,12 +2969,8 @@ static void dwc3_gadget_ep_cleanup_completed_requests(struct dwc3_ep *dep, ...@@ -2976,12 +2969,8 @@ static void dwc3_gadget_ep_cleanup_completed_requests(struct dwc3_ep *dep,
{ {
struct dwc3_request *req; struct dwc3_request *req;
struct dwc3_request *tmp; struct dwc3_request *tmp;
struct list_head local;
restart: list_for_each_entry_safe(req, tmp, &dep->started_list, list) {
list_replace_init(&dep->started_list, &local);
list_for_each_entry_safe(req, tmp, &local, list) {
int ret; int ret;
ret = dwc3_gadget_ep_cleanup_completed_request(dep, event, ret = dwc3_gadget_ep_cleanup_completed_request(dep, event,
...@@ -2989,9 +2978,6 @@ static void dwc3_gadget_ep_cleanup_completed_requests(struct dwc3_ep *dep, ...@@ -2989,9 +2978,6 @@ static void dwc3_gadget_ep_cleanup_completed_requests(struct dwc3_ep *dep,
if (ret) if (ret)
break; break;
} }
if (!list_empty(&dep->started_list))
goto restart;
} }
static bool dwc3_gadget_ep_should_continue(struct dwc3_ep *dep) static bool dwc3_gadget_ep_should_continue(struct dwc3_ep *dep)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment