From: Felipe Balbi <balbi@ti.com>
Date: Mon, 25 Jun 2012 14:09:28 +0000 (+0300)
Subject: usb: dwc3: gadget: remove duplicated code from __dwc3_gadget_ep_set_halt
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9be2395186b3504aa5e337bd3284afb4966caae7;p=linux-beck.git

usb: dwc3: gadget: remove duplicated code from __dwc3_gadget_ep_set_halt

whenever we want to stall ep0, we always call
dwc3_ep0_stall_and_restart() which makes sure
to send ep0state properly rendering the code
in __dwc3_gadget_ep_set_halt() duplicated.

Reported-by: Pratyush Anand <pratyush.anand@st.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
---

diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 1b5fbdd859c2..d98549a7b8b0 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -1209,15 +1209,6 @@ int __dwc3_gadget_ep_set_halt(struct dwc3_ep *dep, int value)
 	memset(&params, 0x00, sizeof(params));
 
 	if (value) {
-		if (dep->number == 0 || dep->number == 1) {
-			/*
-			 * Whenever EP0 is stalled, we will restart
-			 * the state machine, thus moving back to
-			 * Setup Phase
-			 */
-			dwc->ep0state = EP0_SETUP_PHASE;
-		}
-
 		ret = dwc3_send_gadget_ep_cmd(dwc, dep->number,
 			DWC3_DEPCMD_SETSTALL, &params);
 		if (ret)