Merge "usb: dwc3: gadget: check link trb after free_slot is increased" (4b16bfba) · Commits · e / devices / android_kernel_sony_msm8994

drivers/usb/dwc3/gadget.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -878,10 +878,6 @@ static void dwc3_prepare_one_trb(struct dwc3_ep *dep,
		length, last ? " last" : "",
		chain ? " chain" : "");

		/* Skip the LINK-TRB on ISOC */
		if (((dep->free_slot & DWC3_TRB_MASK) == DWC3_TRB_NUM - 1) &&
		usb_endpoint_xfer_isoc(dep->endpoint.desc))
		dep->free_slot++;

		trb = &dep->trb_pool[dep->free_slot & DWC3_TRB_MASK];

		@@ -893,6 +889,10 @@ static void dwc3_prepare_one_trb(struct dwc3_ep *dep,
		}

		dep->free_slot++;
		/* Skip the LINK-TRB on ISOC */
		if (((dep->free_slot & DWC3_TRB_MASK) == DWC3_TRB_NUM - 1) &&
		usb_endpoint_xfer_isoc(dep->endpoint.desc))
		dep->free_slot++;

		update_trb:
		trb->size = DWC3_TRB_SIZE_LENGTH(length);