| From e59ed428cf35929cf9151bcfe541e2acb4453a07 Mon Sep 17 00:00:00 2001 |
| From: Tejas Joglekar <Tejas.Joglekar@synopsys.com> |
| Date: Wed, 13 Nov 2019 11:45:16 +0530 |
| Subject: [PATCH] usb: dwc3: gadget: Fix logical condition |
| |
| commit 8c7d4b7b3d43c54c0b8c1e4adb917a151c754196 upstream. |
| |
| This patch corrects the condition to kick the transfer without |
| giving back the requests when either request has remaining data |
| or when there are pending SGs. The && check was introduced during |
| spliting up the dwc3_gadget_ep_cleanup_completed_requests() function. |
| |
| Fixes: f38e35dd84e2 ("usb: dwc3: gadget: split dwc3_gadget_ep_cleanup_completed_requests()") |
| |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Tejas Joglekar <joglekar@synopsys.com> |
| Signed-off-by: Felipe Balbi <balbi@kernel.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c |
| index caf8f8edb77a..f86d1ebd85cb 100644 |
| --- a/drivers/usb/dwc3/gadget.c |
| +++ b/drivers/usb/dwc3/gadget.c |
| @@ -2453,7 +2453,7 @@ static int dwc3_gadget_ep_cleanup_completed_request(struct dwc3_ep *dep, |
| |
| req->request.actual = req->request.length - req->remaining; |
| |
| - if (!dwc3_gadget_ep_request_completed(req) && |
| + if (!dwc3_gadget_ep_request_completed(req) || |
| req->num_pending_sgs) { |
| __dwc3_gadget_kick_transfer(dep); |
| goto out; |
| -- |
| 2.7.4 |
| |
