Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1677486 > unrolled thread

[PATCH] usb: dwc2: gadget: Use ep->index in conext of FIFO registers

Back to article view | Back to linux.kernel

Contents

  [PATCH] usb: dwc2: gadget: Use ep->index in conext of FIFO registers Minas Harutyunyan <Minas.Harutyunyan@synopsys.com> - 2017-06-29 09:40 +0200
    Re: [PATCH] usb: dwc2: gadget: Use ep->index in conext of FIFO registers Felipe Balbi <balbi@kernel.org> - 2017-06-29 09:50 +0200

#1677486 — [PATCH] usb: dwc2: gadget: Use ep->index in conext of FIFO registers

It's reverting patch for commit "usb: dwc2: gadget:
use ep->fifo_index in context of FIFO registers".
DTXFSTSn indexation based on EP number not TxFIFO number.

Signed-off-by: Minas Harutyunyan <hminas@synopsys.com>
---
 drivers/usb/dwc2/gadget.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 98a4a79e7f6e..34c714de75be 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -526,8 +526,7 @@ 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->fifo_index));
+		can_write = dwc2_readl(hsotg->regs + DTXFSTS(hs_ep->index));
 
 		can_write &= 0xffff;
 		can_write *= 4;
@@ -3153,7 +3152,7 @@ static void kill_all_requests(struct dwc2_hsotg *hsotg,
 
 	if (!hsotg->dedicated_fifos)
 		return;
-	size = (dwc2_readl(hsotg->regs + DTXFSTS(ep->fifo_index)) & 0xffff) * 4;
+	size = (dwc2_readl(hsotg->regs + DTXFSTS(ep->index)) & 0xffff) * 4;
 	if (size < ep->fifo_size)
 		dwc2_hsotg_txfifo_flush(hsotg, ep->fifo_index);
 }
-- 
2.11.0

[toc] | [next] | [standalone]

#1677494

[Multipart message — attachments visible in raw view] — view raw

Hi,

Minas Harutyunyan <Minas.Harutyunyan@synopsys.com> writes:
> It's reverting patch for commit "usb: dwc2: gadget:
> use ep->fifo_index in context of FIFO registers".
> DTXFSTSn indexation based on EP number not TxFIFO number.
>
> Signed-off-by: Minas Harutyunyan <hminas@synopsys.com>

have a look at 'git revert'

-- 
balbi

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web