diff options
| author | Robin Peng <robinpeng@google.com> | 2022-06-02 14:09:32 +0800 |
|---|---|---|
| committer | Robin Peng <robinpeng@google.com> | 2022-06-02 14:09:33 +0800 |
| commit | b4a2f8251c22ee39ca149ed7948170406fd8919a (patch) | |
| tree | a595349e67e68af3eccf5330037002ca1455a816 | |
| parent | 0dbc165fef559adabb9ea0c882919ecc7877a6c7 (diff) | |
| parent | 47317ce4252f7d334aca9cc2447e4c26894191ca (diff) | |
| download | gs-b4a2f8251c22ee39ca149ed7948170406fd8919a.tar.gz | |
Merge android13-5.10-2022-05 into android13-gs-pixel-5.10-gs101-tm
Merge SHA:
47317ce4252f UPSTREAM: usb: dwc3: gadget: Move null pinter check to proper place
Bug: 233884654
Bug: 224405818
Signed-off-by: Robin Peng <robinpeng@google.com>
Change-Id: I4270cd24da09847c48970d74742da850a6e6f868
| -rw-r--r-- | drivers/usb/dwc3/gadget.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 2f8004d5c0dc..8054b822c680 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -3286,14 +3286,14 @@ static bool dwc3_gadget_endpoint_trbs_complete(struct dwc3_ep *dep, struct dwc3 *dwc = dep->dwc; bool no_started_trb = true; - if (!dep->endpoint.desc) - return no_started_trb; - dwc3_gadget_ep_cleanup_completed_requests(dep, event, status); if (dep->flags & DWC3_EP_END_TRANSFER_PENDING) goto out; + if (!dep->endpoint.desc) + return no_started_trb; + if (usb_endpoint_xfer_isoc(dep->endpoint.desc) && list_empty(&dep->started_list) && (list_empty(&dep->pending_list) || status == -EXDEV)) |