From f79a6ac36ba61a32880fd2ce8c970cb350629408 Mon Sep 17 00:00:00 2001 From: Felipe Balbi Date: Thu, 24 May 2012 10:30:01 +0300 Subject: [PATCH] --- yaml --- r: 316939 b: refs/heads/master c: c4430a26948b84c0d820e83f8c640229f960d3b6 h: refs/heads/master i: 316937: b66fa3d1e8b98477de25ffe4e730bf5c3c6b79c9 316935: 4cb3e91b099258a1fe5deb3cbbc9665c90d781c3 v: v3 --- [refs] | 2 +- trunk/drivers/usb/dwc3/gadget.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index c6c5377d2e6a..1ef81d46779e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fcc023c726b5879d8f3f0f0f48c45d09055272c4 +refs/heads/master: c4430a26948b84c0d820e83f8c640229f960d3b6 diff --git a/trunk/drivers/usb/dwc3/gadget.c b/trunk/drivers/usb/dwc3/gadget.c index 867c476853ec..054ee5ec5c13 100644 --- a/trunk/drivers/usb/dwc3/gadget.c +++ b/trunk/drivers/usb/dwc3/gadget.c @@ -1906,11 +1906,9 @@ static void dwc3_clear_stall_all_ep(struct dwc3 *dwc) static void dwc3_gadget_disconnect_interrupt(struct dwc3 *dwc) { + int reg; + dev_vdbg(dwc->dev, "%s\n", __func__); -#if 0 - XXX - U1/U2 is powersave optimization. Skip it for now. Anyway we need to - enable it before we can disable it. reg = dwc3_readl(dwc->regs, DWC3_DCTL); reg &= ~DWC3_DCTL_INITU1ENA; @@ -1918,7 +1916,6 @@ static void dwc3_gadget_disconnect_interrupt(struct dwc3 *dwc) reg &= ~DWC3_DCTL_INITU2ENA; dwc3_writel(dwc->regs, DWC3_DCTL, reg); -#endif dwc3_stop_active_transfers(dwc); dwc3_disconnect_gadget(dwc);