diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-08-16 09:04:28 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-08-16 09:04:28 +0200 |
commit | 2dec48c32a349e51920b6a53b464982db4ed1563 (patch) | |
tree | 2b9cccff8a823d9c6c1a06865f788b183f72d48f /drivers/usb/dwc3 | |
parent | cea45a3bd2dd4d9c35581328f571afd32b3c9f48 (diff) | |
parent | 7c60610d476766e128cc4284bb6349732cbd6606 (diff) | |
download | linux-stable-2dec48c32a349e51920b6a53b464982db4ed1563.tar.gz linux-stable-2dec48c32a349e51920b6a53b464982db4ed1563.tar.bz2 linux-stable-2dec48c32a349e51920b6a53b464982db4ed1563.zip |
Merge 5.14-rc6 into usb-next
We need the USB fix in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/dwc3')
-rw-r--r-- | drivers/usb/dwc3/gadget.c | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 54c5a08fc836..5d084542718d 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -1926,13 +1926,9 @@ static void dwc3_gadget_ep_cleanup_cancelled_requests(struct dwc3_ep *dep) { 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: @@ -1950,9 +1946,6 @@ restart: break; } } - - if (!list_empty(&dep->cancelled_list)) - goto restart; } static int dwc3_gadget_ep_dequeue(struct usb_ep *ep, @@ -3208,12 +3201,8 @@ static void dwc3_gadget_ep_cleanup_completed_requests(struct dwc3_ep *dep, { 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, @@ -3221,9 +3210,6 @@ restart: if (ret) break; } - - if (!list_empty(&dep->started_list)) - goto restart; } static bool dwc3_gadget_ep_should_continue(struct dwc3_ep *dep) |