From: Minas Harutyunyan <minas.harutyunyan@synopsys.com>
Date: Fri, 22 Feb 2019 11:49:19 +0000 (+0400)
Subject: dwc2: gadget: Fix completed transfer size calculation in DDMA
X-Git-Tag: Ubuntu-4.15.0-89.89~276
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=66f5b500da0d693e931f68311a0d1e11dcb90cb9;p=mirror_ubuntu-bionic-kernel.git

dwc2: gadget: Fix completed transfer size calculation in DDMA

BugLink: https://bugs.launchpad.net/bugs/1863019

[ Upstream commit 5acb4b970184d189d901192d075997c933b82260 ]

Fix calculation of transfer size on completion in function
dwc2_gadget_get_xfersize_ddma().

Added increment of descriptor pointer to move to next descriptor in
the loop.

Fixes: aa3e8bc81311 ("usb: dwc2: gadget: DDMA transfer start and complete")

Signed-off-by: Minas Harutyunyan <hminas@synopsys.com>
Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
---

diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 5aa7b30616dd..ce9df56b3474 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -2235,6 +2235,7 @@ static unsigned int dwc2_gadget_get_xfersize_ddma(struct dwc2_hsotg_ep *hs_ep)
 		if (status & DEV_DMA_STS_MASK)
 			dev_err(hsotg->dev, "descriptor %d closed with %x\n",
 				i, status & DEV_DMA_STS_MASK);
+		desc++;
 	}
 
 	return bytes_rem;