Merge "dwc3: Remove check for HWO flag in dwc3_gadget_ep_reclaim_trb_sg()" (e9ea3e9a) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/usb/dwc3/gadget.c

+2 −7

Original line number	Diff line number	Diff line
		@@ -1642,7 +1642,7 @@ static void dwc3_gadget_ep_skip_trbs(struct dwc3_ep dep, struct dwc3_request r
		for (i = 0; i < req->num_trbs; i++) {
		struct dwc3_trb *trb;

		trb = req->trb + i;
		trb = &dep->trb_pool[dep->trb_dequeue];
		trb->ctrl &= ~DWC3_TRB_CTRL_HWO;
		dwc3_ep_inc_deq(dep);
		}
		@@ -2802,9 +2802,6 @@ static int dwc3_gadget_ep_reclaim_trb_sg(struct dwc3_ep *dep,
		for_each_sg(sg, s, pending, i) {
		trb = &dep->trb_pool[dep->trb_dequeue];

		if (trb->ctrl & DWC3_TRB_CTRL_HWO)
		break;

		req->sg = sg_next(s);
		req->num_pending_sgs--;

		@@ -2926,10 +2923,8 @@ static void dwc3_gadget_endpoint_transfer_in_progress(struct dwc3_ep *dep,

		dwc3_gadget_ep_cleanup_completed_requests(dep, event, status);

		if (stop) {
		if (stop)
		dwc3_stop_active_transfer(dep, true, true);
		dep->flags = DWC3_EP_ENABLED;
		}

		/*
		* WORKAROUND: This is the 2nd half of U1/U2 -> U0 workaround.