aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-12-13 19:56:59 +0000
committerMark Brown <broonie@kernel.org>2014-12-13 19:57:25 +0000
commitd72e78d889908d4ff8524a4a97378d3b646746cc (patch)
treec596f8b6b96d1ed51bfdf8f88b12fe936dbb2cd2
parent84ef44fda92bbf2c1818f8a3781a3376f72947a6 (diff)
downloadlinux-linaro-stable-d72e78d889908d4ff8524a4a97378d3b646746cc.tar.gz
usb: dwc3: Fix previous mismergelsk-v3.14-14.12
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--drivers/usb/dwc3/gadget.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c
index 09401ce85ad3..5bdbcff83bd5 100644
--- a/drivers/usb/dwc3/gadget.c
+++ b/drivers/usb/dwc3/gadget.c
@@ -587,7 +587,7 @@ static int __dwc3_gadget_ep_disable(struct dwc3_ep *dep)
/* make sure HW endpoint isn't stalled */
if (dep->flags & DWC3_EP_STALL)
- __dwc3_gadget_ep_set_halt(dep, 0);
+ __dwc3_gadget_ep_set_halt(dep, 0, false);
reg = dwc3_readl(dwc->regs, DWC3_DALEPENA);
reg &= ~DWC3_DALEPENA_EP(dep->number);