Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c07b20e authored by Robert Baldyga's avatar Robert Baldyga Committed by Felipe Balbi
Browse files

usb: dwc2: gadget: free TX FIFO after killing requests 



As kill_all_requests() potentially flushes TX FIFO, we should should
free FIFO after calling it. Otherwise FIFO could stay unflushed properly.

Signed-off-by: default avatarRobert Baldyga <r.baldyga@samsung.com>
Signed-off-by: default avatarJohn Youn <johnyoun@synopsys.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent 21f3bb52

drivers/usb/dwc2/gadget.c

+4 −4
Original line number Diff line number Diff line
@@ -3120,10 +3120,6 @@ static int dwc2_hsotg_ep_disable(struct usb_ep *ep) 


	spin_lock_irqsave(&hsotg->lock, flags);



	hsotg->fifo_map &= ~(1<<hs_ep->fifo_index);

	hs_ep->fifo_index = 0;

	hs_ep->fifo_size = 0;



	ctrl = dwc2_readl(hsotg->regs + epctrl_reg);

	ctrl &= ~DXEPCTL_EPENA;

	ctrl &= ~DXEPCTL_USBACTEP;
@@ -3138,6 +3134,10 @@ static int dwc2_hsotg_ep_disable(struct usb_ep *ep) 
	/* terminate all requests with shutdown */

	kill_all_requests(hsotg, hs_ep, -ESHUTDOWN);



	hsotg->fifo_map &= ~(1 << hs_ep->fifo_index);

	hs_ep->fifo_index = 0;

	hs_ep->fifo_size = 0;



	spin_unlock_irqrestore(&hsotg->lock, flags);

	return 0;

}