diff options
author | Felipe Balbi <balbi@ti.com> | 2014-04-16 10:30:33 -0500 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2014-12-08 17:51:13 +0000 |
commit | 9524c3c1b493d536bbeb8334958e78719117c854 (patch) | |
tree | 015e534f3ab06267b2270b67660fa03935ccc3a2 | |
parent | 359af0c69b66dc3aa48a5b678917425760a007e6 (diff) |
usb: dwc3: gadget: clear stall when disabling endpoint
so it seems like DWC3 IP doesn't clear stalls
automatically when we disable an endpoint, because
of that, we _must_ make sure stalls are cleared
before clearing the proper bit in DALEPENA register.
Cc: <stable@vger.kernel.org> # v3.4+
Reported-by: Johannes Stezenbach <js@sig21.net>
Signed-off-by: Felipe Balbi <balbi@ti.com>
(cherry picked from commit 687ef9817df7ed960d14575b9033dde3d04631fe)
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | drivers/usb/dwc3/gadget.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index 2da0a5a2803a..09e9619ae381 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -586,6 +586,10 @@ static int __dwc3_gadget_ep_disable(struct dwc3_ep *dep) dwc3_remove_requests(dwc, dep); + /* make sure HW endpoint isn't stalled */ + if (dep->flags & DWC3_EP_STALL) + __dwc3_gadget_ep_set_halt(dep, 0); + reg = dwc3_readl(dwc->regs, DWC3_DALEPENA); reg &= ~DWC3_DALEPENA_EP(dep->number); dwc3_writel(dwc->regs, DWC3_DALEPENA, reg); |