diff options
| author | Thinh Nguyen <Thinh.Nguyen@synopsys.com> | 2020-09-24 01:21:24 -0700 |
|---|---|---|
| committer | Felipe Balbi <balbi@kernel.org> | 2020-10-02 09:57:44 +0300 |
| commit | 690e5c2dc29f8891fcfd30da67e0d5837c2c9df5 (patch) | |
| tree | b16618c7d6ad51e9b3227e2502df854e58d662d8 /drivers/usb/dwc3 | |
| parent | ca3df3468eec87f6374662f7de425bc44c3810c1 (diff) | |
| download | linux-stable-690e5c2dc29f8891fcfd30da67e0d5837c2c9df5.tar.gz linux-stable-690e5c2dc29f8891fcfd30da67e0d5837c2c9df5.tar.bz2 linux-stable-690e5c2dc29f8891fcfd30da67e0d5837c2c9df5.zip | |
usb: dwc3: gadget: Reclaim extra TRBs after request completion
An SG request may be partially completed (due to no available TRBs).
Don't reclaim extra TRBs and clear the needs_extra_trb flag until the
request is fully completed. Otherwise, the driver will reclaim the wrong
TRB.
Cc: stable@vger.kernel.org
Fixes: 1f512119a08c ("usb: dwc3: gadget: add remaining sg entries to ring")
Signed-off-by: Thinh Nguyen <Thinh.Nguyen@synopsys.com>
Signed-off-by: Felipe Balbi <balbi@kernel.org>
Diffstat (limited to 'drivers/usb/dwc3')
| -rw-r--r-- | drivers/usb/dwc3/gadget.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 7e1909dd041b..173421508635 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -2744,6 +2744,11 @@ static int dwc3_gadget_ep_cleanup_completed_request(struct dwc3_ep *dep, ret = dwc3_gadget_ep_reclaim_trb_linear(dep, req, event, status); + req->request.actual = req->request.length - req->remaining; + + if (!dwc3_gadget_ep_request_completed(req)) + goto out; + if (req->needs_extra_trb) { unsigned int maxp = usb_endpoint_maxp(dep->endpoint.desc); @@ -2759,11 +2764,6 @@ static int dwc3_gadget_ep_cleanup_completed_request(struct dwc3_ep *dep, req->needs_extra_trb = false; } - req->request.actual = req->request.length - req->remaining; - - if (!dwc3_gadget_ep_request_completed(req)) - goto out; - dwc3_gadget_giveback(dep, req, status); out: |