From f2d87eb3a02f9bc3442910120f431dac74c8ae10 Mon Sep 17 00:00:00 2001 From: Saravana Kannan Date: Thu, 3 Jun 2021 18:13:57 +0000 Subject: [PATCH] Revert "Revert "ANDROID: usb: dwc3: gadget: don't cancel the started requests"" This reverts commit 17f230fd930d9c71578c197001623574bfec530d. Reason for revert: adb connection is unstable on Mac C-C setup and breaking the workflow for a lot of people. We can revert this later if we find and fix any userspace issues that might be causing this. Bug: 188778499 Change-Id: I9507207b4093d3eba25132657c84ecf7407d6df9 Signed-off-by: Saravana Kannan --- drivers/usb/dwc3/gadget.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 7da817c7218e..d20598a5cfac 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -1823,8 +1823,6 @@ 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)) { @@ -1873,16 +1871,14 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value, int protocol) dwc3_stop_active_transfer(dep, true, true); - list_for_each_entry_safe(req, tmp, &dep->started_list, list) - dwc3_gadget_move_cancelled_request(req, DWC3_REQUEST_STATUS_STALLED); + if (!list_empty(&dep->started_list)) + dep->flags |= DWC3_EP_DELAY_START; 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",