From cf74f8dc0e7121d654849d224071258fec19748c Mon Sep 17 00:00:00 2001 From: Robert Baldyga Date: Mon, 29 Aug 2016 13:38:50 -0700 Subject: [PATCH] UPSTREAM: usb: dwc2: gadget: use ep->fifo_index in context of FIFO registers In context of FIFO registers we use ep->fifo_index instead of ep->index. Change-Id: Iff6b518e286d095a8be50551e2caba52cedbfab7 Signed-off-by: Robert Baldyga Signed-off-by: John Youn Signed-off-by: Felipe Balbi Signed-off-by: William Wu (cherry picked from commit ad674a15249e7d800162858e49272877a782ec40) --- drivers/usb/dwc2/gadget.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c index 70959ce6a07d..f63b5ed8366f 100644 --- a/drivers/usb/dwc2/gadget.c +++ b/drivers/usb/dwc2/gadget.c @@ -388,7 +388,8 @@ static int dwc2_hsotg_write_fifo(struct dwc2_hsotg *hsotg, return -ENOSPC; } } else if (hsotg->dedicated_fifos && hs_ep->index != 0) { - can_write = dwc2_readl(hsotg->regs + DTXFSTS(hs_ep->index)); + can_write = dwc2_readl(hsotg->regs + + DTXFSTS(hs_ep->fifo_index)); can_write &= 0xffff; can_write *= 4; @@ -2432,7 +2433,7 @@ static void kill_all_requests(struct dwc2_hsotg *hsotg, if (!hsotg->dedicated_fifos) return; - size = (dwc2_readl(hsotg->regs + DTXFSTS(ep->index)) & 0xffff) * 4; + size = (dwc2_readl(hsotg->regs + DTXFSTS(ep->fifo_index)) & 0xffff) * 4; if (size < ep->fifo_size) dwc2_hsotg_txfifo_flush(hsotg, ep->fifo_index); }