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

Commit 1d6d35ff authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: dwc3: gadget: Prevent tx fifo resize before set config" into msm-4.8

parents 24c7dad1 f0ce2556

drivers/usb/dwc3/gadget.c

+4 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ int dwc3_gadget_resize_tx_fifos(struct dwc3 *dwc) 
	int		num_eps;

	struct usb_composite_dev *cdev = get_gadget_data(&dwc->gadget);



	if (!dwc->needs_fifo_resize)

	if (!(cdev && cdev->config) || !dwc->needs_fifo_resize)

		return 0;



	/* gadget.num_eps never be greater than dwc->num_in_eps */
@@ -2872,6 +2872,9 @@ static void dwc3_gadget_reset_interrupt(struct dwc3 *dwc) 
	dwc3_stop_active_transfers(dwc);

	dwc3_clear_stall_all_ep(dwc);



	/* bus reset issued due to missing status stage of a control transfer */

	dwc->resize_fifos = 0;



	/* Reset device address to zero */

	reg = dwc3_readl(dwc->regs, DWC3_DCFG);

	reg &= ~(DWC3_DCFG_DEVADDR_MASK);