Commit 3ccf60e1 authored Jan 19, 2017 by Felipe Balbi Committed by Greg Kroah-Hartman Mar 12, 2017

usb: dwc3: gadget: skip Set/Clear Halt when invalid



commit ffb80fc672c3a7b6afd0cefcb1524fb99917b2f3 upstream.

At least macOS seems to be sending
ClearFeature(ENDPOINT_HALT) to endpoints which
aren't Halted. This makes DWC3's CLEARSTALL command
time out which causes several issues for the driver.

Instead, let's just return 0 and bail out early.

Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 5413f432

drivers/usb/dwc3/gadget.c

+5 −0

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

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

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

		ret = dwc3_send_clear_stall_ep_cmd(dep);
		if (ret)