From 17f230fd930d9c71578c197001623574bfec530d Mon Sep 17 00:00:00 2001 From: Ray Chi Date: Mon, 17 May 2021 16:52:14 +0800 Subject: [PATCH] Revert "ANDROID: usb: dwc3: gadget: don't cancel the started requests" This reverts commit 92de566762db61b138765a26e4afaacc7d7f7816. This commit is not needed since userspace will handle corresponding behavior if the device received ClearFeature(halt_ep) request. Bug: 178904115 Signed-off-by: Ray Chi Change-Id: I94d40af0b25f7f582cd67ac509c6498355a6ba8a --- drivers/usb/dwc3/gadget.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 522312c19252..bdd5b9d8a080 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -1822,6 +1822,8 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value, int protocol) { struct dwc3_gadget_ep_cmd_params params; struct dwc3 *dwc = dep->dwc; + struct dwc3_request *req; + struct dwc3_request *tmp; int ret; if (usb_endpoint_xfer_isoc(dep->endpoint.desc)) { @@ -1870,14 +1872,16 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value, int protocol) dwc3_stop_active_transfer(dep, true, true); - if (!list_empty(&dep->started_list)) - dep->flags |= DWC3_EP_DELAY_START; + list_for_each_entry_safe(req, tmp, &dep->started_list, list) + dwc3_gadget_move_cancelled_request(req, DWC3_REQUEST_STATUS_STALLED); if (dep->flags & DWC3_EP_END_TRANSFER_PENDING) { dep->flags |= DWC3_EP_PENDING_CLEAR_STALL; return 0; } + dwc3_gadget_ep_cleanup_cancelled_requests(dep); + ret = dwc3_send_clear_stall_ep_cmd(dep); if (ret) { dev_err(dwc->dev, "failed to clear STALL on %s\n",