Merge "Revert "usb: dwc3: gadget: skip Set/Clear Halt when invalid"" into msm-4.9 (f90e36a7) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/usb/dwc3/gadget.c

+0 −5

Original line number	Original line	Diff line number	Diff line
	@@ -1451,9 +1451,6 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value, int protocol)
	unsigned transfer_in_flight;		unsigned transfer_in_flight;
	unsigned started;		unsigned started;

	if (dep->flags & DWC3_EP_STALL)
	return 0;

	if (dep->number > 1)		if (dep->number > 1)
	trb = dwc3_ep_prev_trb(dep, dep->trb_enqueue);		trb = dwc3_ep_prev_trb(dep, dep->trb_enqueue);
	else		else
	@@ -1478,8 +1475,6 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value, int protocol)
	else		else
	dep->flags \|= DWC3_EP_STALL;		dep->flags \|= DWC3_EP_STALL;
	} else {		} else {
	if (!(dep->flags & DWC3_EP_STALL))
	return 0;

	ret = dwc3_send_clear_stall_ep_cmd(dep);		ret = dwc3_send_clear_stall_ep_cmd(dep);
	if (ret)		if (ret)