From: John Youn Date: Tue, 22 Dec 2015 20:23:20 +0000 (-0800) Subject: UPSTREAM: usb: dwc3: gadget: don't send extra ZLP X-Git-Tag: firefly_0821_release~3271 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=64f6e3af251c82b39503a84f531cb6961e65672e;p=firefly-linux-kernel-4.4.55.git UPSTREAM: usb: dwc3: gadget: don't send extra ZLP If the request->length is zero, a ZLP should already be sent due to that and another ZLP is not needed to terminate the transfer. Fixes: 04c03d10e507 ("usb: dwc3: gadget: handle request->zero") Signed-off-by: John Youn Signed-off-by: Felipe Balbi (cherry picked from commit d9261898a4b2c143c28568dc686a1becfc637a99) Change-Id: Ib976552f93321f6ea52d3f0151c66fd6f2db8b17 Signed-off-by: Wu Liang feng --- diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 64b2a8303d33..af023a81a0b0 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -1203,7 +1203,8 @@ static int dwc3_gadget_ep_queue(struct usb_ep *ep, struct usb_request *request, * extra usb_request ourselves so that it gets handled the same way as * any other request. */ - if (ret == 0 && request->zero && (request->length % ep->maxpacket == 0)) + if (ret == 0 && request->zero && request->length && + (request->length % ep->maxpacket == 0)) ret = __dwc3_gadget_ep_queue_zlp(dwc, dep); spin_unlock_irqrestore(&dwc->lock, flags);