usb: dwc3: gadget: conditionally remove requests
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>
This commit is contained in:
parent
b6caf79d21
commit
b44c0e7fef
@ -965,7 +965,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;
|
||||||
|
|
||||||
@ -975,19 +975,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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1022,7 +1022,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;
|
||||||
@ -2340,7 +2340,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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user