Merge "usb: dwc3: gadget: Give back staled requests"

This commit is contained in:
qctecmdr 2020-05-22 16:30:12 -07:00 • committed by Gerrit - the friendly Code Review server
commit 32b9fcd606

View file

@ -1682,6 +1682,11 @@ static int dwc3_gadget_ep_dequeue(struct usb_ep *ep,
spin_lock_irqsave(&dwc->lock, flags);
list_for_each_entry(r, &dep->cancelled_list, list) {
if (r == req)
goto out0;
}
list_for_each_entry(r, &dep->pending_list, list) {
if (r == req)
break;
@ -1693,13 +1698,21 @@ static int dwc3_gadget_ep_dequeue(struct usb_ep *ep,
break;
}
if (r == req) {
struct dwc3_request *t;
/* wait until it is processed */
dwc3_stop_active_transfer(dep, true, true);
if (!r->trb)
goto out0;
dwc3_gadget_move_cancelled_request(req);
/*
* Remove any started request if the transfer is
* cancelled.
*/
list_for_each_entry_safe(r, t, &dep->started_list, list)
dwc3_gadget_move_cancelled_request(r);
if (dep->flags & DWC3_EP_TRANSFER_STARTED)
goto out0;
else