summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTejas Joglekar <Tejas.Joglekar@synopsys.com>2019-11-13 09:15:16 +0300
committerFelipe Balbi <balbi@kernel.org>2019-12-10 15:52:41 +0300
commit8c7d4b7b3d43c54c0b8c1e4adb917a151c754196 (patch)
tree84366b73e59cf81b0afdc9a5afeae6700b7ca4ad /drivers
parente42617b825f8073569da76dc4510bfa019b1c35a (diff)
downloadlinux-8c7d4b7b3d43c54c0b8c1e4adb917a151c754196.tar.xz
usb: dwc3: gadget: Fix logical condition
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/dwc3/gadget.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index a9aba716bf80..6ff6ee4fe5aa 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -2491,7 +2491,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;