xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

usb: dwc3: gadget: conditionally remove requests

Browse Source 
[ Upstream commit b44c0e7fef51ee7e8ca8c6efbf706f5613787100 ]

The functions stop_active_transfers and ep_disable are both calling
remove_requests. This functions in both cases will giveback the requests
with status ESHUTDOWN, which also represents an physical disconnection.
For ep_disable this is not true. This patch adds the status parameter to
remove_requests and sets the status to ECONNRESET on ep_disable.

Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Link: https://lore.kernel.org/r/20220720213523.1055897-1-m.grzeschik@pengutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Stable-dep-of: f90f5afd5083 ("usb: dwc3: gadget: Clear ep descriptor last")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Michael Grzeschik
2022-07-20 23:35:23 +02:00
committed by Greg Kroah-Hartman
parent ca3a08e9d9
commit a32635528d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/usb/dwc3/gadget.c
View File

@@ -752,7 +752,7 @@ out:
return 0; return 0;
} }
static void dwc3_remove_requests(struct dwc3 *dwc, struct dwc3_ep *dep) static void dwc3_remove_requests(struct dwc3 *dwc, struct dwc3_ep *dep, int status)
{ {
struct dwc3_request *req; struct dwc3_request *req;
@@ -762,19 +762,19 @@ static void dwc3_remove_requests(struct dwc3 *dwc, struct dwc3_ep *dep)
while (!list_empty(&dep->started_list)) { while (!list_empty(&dep->started_list)) {
req = next_request(&dep->started_list); req = next_request(&dep->started_list);
dwc3_gadget_giveback(dep, req, -ESHUTDOWN); dwc3_gadget_giveback(dep, req, status);
} }
while (!list_empty(&dep->pending_list)) { while (!list_empty(&dep->pending_list)) {
req = next_request(&dep->pending_list); req = next_request(&dep->pending_list);
dwc3_gadget_giveback(dep, req, -ESHUTDOWN); dwc3_gadget_giveback(dep, req, status);
} }
while (!list_empty(&dep->cancelled_list)) { while (!list_empty(&dep->cancelled_list)) {
req = next_request(&dep->cancelled_list); req = next_request(&dep->cancelled_list);
dwc3_gadget_giveback(dep, req, -ESHUTDOWN); dwc3_gadget_giveback(dep, req, status);
} }
} }
@@ -809,7 +809,7 @@ static int __dwc3_gadget_ep_disable(struct dwc3_ep *dep)
dep->endpoint.desc = NULL; dep->endpoint.desc = NULL;
} }
dwc3_remove_requests(dwc, dep); dwc3_remove_requests(dwc, dep, -ECONNRESET);
dep->stream_capable = false; dep->stream_capable = false;
dep->type = 0; dep->type = 0;
@@ -2067,7 +2067,7 @@ static void dwc3_stop_active_transfers(struct dwc3 *dwc)
if (!dep) if (!dep)
continue; continue;
dwc3_remove_requests(dwc, dep); dwc3_remove_requests(dwc, dep, -ESHUTDOWN);
} }
} }