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

Commit a535d81c authored by Alan Stern's avatar Alan Stern Committed by Felipe Balbi
Browse files

usb: dwc3: fix implementation of endpoint wedge 



The dwc3 UDC driver doesn't implement endpoint wedging correctly.
When an endpoint is wedged, the gadget driver should be allowed to
clear the wedge by calling usb_ep_clear_halt().  Only the host is
prevented from resetting the endpoint.

This patch fixes the implementation.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Tested-by: default avatarPratyush Anand <pratyush.anand@st.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 655403c2

drivers/usb/dwc3/ep0.c

+2 −0
Original line number Diff line number Diff line
@@ -459,6 +459,8 @@ static int dwc3_ep0_handle_feature(struct dwc3 *dwc, 
			dep = dwc3_wIndex_to_dep(dwc, wIndex);

			if (!dep)

				return -EINVAL;

			if (set == 0 && (dep->flags & DWC3_EP_WEDGE))

				break;

			ret = __dwc3_gadget_ep_set_halt(dep, set);

			if (ret)

				return -EINVAL;

drivers/usb/dwc3/gadget.c

+1 −4
Original line number Diff line number Diff line
@@ -1200,9 +1200,6 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value) 
		else

			dep->flags |= DWC3_EP_STALL;

	} else {

		if (dep->flags & DWC3_EP_WEDGE)

			return 0;



		ret = dwc3_send_gadget_ep_cmd(dwc, dep->number,

			DWC3_DEPCMD_CLEARSTALL, &params);

		if (ret)
@@ -1210,7 +1207,7 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value) 
					value ? "set" : "clear",

					dep->name);

		else

			dep->flags &= ~DWC3_EP_STALL;

			dep->flags &= ~(DWC3_EP_STALL | DWC3_EP_WEDGE);

	}



	return ret;