From 796d2c6089ef2d02a7dcc9b73c3476d376ebcede Mon Sep 17 00:00:00 2001 From: Blagovest Kolenichev Date: Thu, 23 Jan 2020 03:09:46 -0800 Subject: [PATCH] Revert "usb: dwc3: gadget: Fix logical condition" This reverts commit a7f7e61270f1676517c2f6f2903317f77f122f15. This is a preparation change for merging android-5.4.5 into msm-5.4 branch. The reverted change is basically preventing the adbd userspace daemon from ever receiving packets from the kernel USB driver. Change-Id: I083e78968b72e8e0c4529d732c3b1ab5f9946224 Reported-by: Jack Pham Signed-off-by: Blagovest Kolenichev --- drivers/usb/dwc3/gadget.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 0c960a97ea02..5b0f02fd56cf 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;