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

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

Merge "usb: gadget: Iterate over all IN EPs for allocation of TX FIFOs" into msm-4.8

parents 3f73862a 520de144

drivers/usb/dwc3/gadget.c

+2 −4
Original line number Diff line number Diff line
@@ -209,9 +209,7 @@ int dwc3_gadget_resize_tx_fifos(struct dwc3 *dwc) 
	if (!(cdev && cdev->config) || !dwc->needs_fifo_resize)

		return 0;



	/* gadget.num_eps never be greater than dwc->num_in_eps */

	num_eps = min_t(int, dwc->num_in_eps,

			cdev->config->num_ineps_used + 1);

	num_eps = dwc->num_in_eps;

	ram1_depth = DWC3_RAM1_DEPTH(dwc->hwparams.hwparams7);

	mdwidth = DWC3_MDWIDTH(dwc->hwparams.hwparams0);
@@ -229,7 +227,7 @@ int dwc3_gadget_resize_tx_fifos(struct dwc3 *dwc) 
		int		tmp;



		if (!(dep->flags & DWC3_EP_ENABLED)) {

			dev_warn(dwc->dev, "ep%dIn not enabled", num);

			dev_dbg(dwc->dev, "ep%dIn not enabled", num);

			tmp = max_packet + mdwidth;

			goto resize_fifo;

		}