diff options
| author | Mark Brown <broonie@kernel.org> | 2014-12-13 19:57:40 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-12-13 19:57:40 +0000 |
| commit | bd9271937f15b4dccd379869348d83d0c1d04372 (patch) | |
| tree | 7e05f1db1f8a67880f0565445d0475d3a0f3cb5b /drivers | |
| parent | a8746c6e3ad1c6da7f3666b38251733e9b3450d8 (diff) | |
| parent | d72e78d889908d4ff8524a4a97378d3b646746cc (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-androidlsk-v3.14-android-14.12
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/dwc3/gadget.c | 2 |
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); |