commit 5275455a6e6ae6b57303834b0afd267bb9657ffc
author Paul Zimmerman <Paul.Zimmerman@synopsys.com> Fri Sep 30 10:58:44 2011 +0300
committer Greg Kroah-Hartman <gregkh@suse.de> Tue Oct 04 10:25:53 2011 -0700
tree a8ff14919fc0f62459771e667a101439ec9cbc65
parent 82828ca77b8b63b817d9bb540145a4cafa9be582

usb: dwc3: gadget: make DWC3_EP_WEDGE do the right thing

This makes DWC3_EP_WEDGE do the right thing, which is
prevent DWC3_EP_WEDGE from ever being cleared by a
ClearFeature(HALT) command.

[ balbi@ti.com : allowed set_wedge to send SetHalt command
	to controller ]

Signed-off-by: Paul Zimmerman <paulz@synopsys.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

drivers/usb/dwc3/gadget.c

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index fd5d2bd..16f2ba6 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -894,6 +894,9 @@
 		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)
@@ -903,6 +906,7 @@
 		else
 			dep->flags &= ~DWC3_EP_STALL;
 	}
+
 	return ret;
 }
 
@@ -936,7 +940,7 @@
 
 	dep->flags |= DWC3_EP_WEDGE;
 
-	return usb_ep_set_halt(ep);
+	return dwc3_gadget_ep_set_halt(ep, 1);
 }
 
 /* -------------------------------------------------------------------------- */