diff options
author | Tom Rini <trini@konsulko.com> | 2025-10-06 13:20:24 -0600 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2025-10-06 13:20:24 -0600 |
commit | 0eaa4b337336dbbe93395d1f2ccc18937eaafea2 (patch) | |
tree | c01e661d69181dceca68f56a4849a9bd04608521 /drivers/usb/dwc3/ep0.c | |
parent | e50b1e8715011def8aff1588081a2649a2c6cd47 (diff) | |
parent | 4e4a9de31de2a5f395ee25c59e4026422fbcb27e (diff) |
Merge branch 'next'
Merge the outstanding changes from the 'next' branch to master.
Diffstat (limited to 'drivers/usb/dwc3/ep0.c')
-rw-r--r-- | drivers/usb/dwc3/ep0.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/usb/dwc3/ep0.c b/drivers/usb/dwc3/ep0.c index c656cbe25ce..680756532f0 100644 --- a/drivers/usb/dwc3/ep0.c +++ b/drivers/usb/dwc3/ep0.c @@ -799,10 +799,7 @@ static void dwc3_ep0_complete_data(struct dwc3 *dwc, status = DWC3_TRB_SIZE_TRBSTS(trb->size); if (status == DWC3_TRBSTS_SETUP_PENDING) { dev_dbg(dwc->dev, "Setup Pending received"); - - if (r) - dwc3_gadget_giveback(ep0, r, -ECONNRESET); - + dwc3_gadget_giveback(ep0, r, -ECONNRESET); return; } |