diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-06 10:51:06 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-06 10:51:06 -0500 |
| commit | 66267ee58732bb4c21c7bbba004ee481b8ad2b30 (patch) | |
| tree | bf7f72e623d7c1ca6472e0a1286e802cd3bff139 /drivers/usb/dwc3 | |
| parent | 6ed68a6d83e4497dc33581ccc82b4fa3e7e8226d (diff) | |
| parent | f58007762f537ba13674a3138b3f4c20fff1cba9 (diff) | |
Merge branch 'arm-next' of git://git.xilinx.com/linux-xlnx into next/cleanup
From Michal Simek:
* 'arm-next' of git://git.xilinx.com/linux-xlnx:
zynq: move static peripheral mappings
zynq: remove use of CLKDEV_LOOKUP
zynq: use pl310 device tree bindings
zynq: use GIC device tree bindings
+ Linux 3.7-rc3
Diffstat (limited to 'drivers/usb/dwc3')
| -rw-r--r-- | drivers/usb/dwc3/core.c | 4 | ||||
| -rw-r--r-- | drivers/usb/dwc3/gadget.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index b415c0c859d..c14ebc975ba 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c | |||
| @@ -409,6 +409,10 @@ static void dwc3_core_exit(struct dwc3 *dwc) | |||
| 409 | { | 409 | { |
| 410 | dwc3_event_buffers_cleanup(dwc); | 410 | dwc3_event_buffers_cleanup(dwc); |
| 411 | dwc3_free_event_buffers(dwc); | 411 | dwc3_free_event_buffers(dwc); |
| 412 | |||
| 413 | usb_phy_shutdown(dwc->usb2_phy); | ||
| 414 | usb_phy_shutdown(dwc->usb3_phy); | ||
| 415 | |||
| 412 | } | 416 | } |
| 413 | 417 | ||
| 414 | #define DWC3_ALIGN_MASK (16 - 1) | 418 | #define DWC3_ALIGN_MASK (16 - 1) |
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index c9e729a4bf6..7b7deddf6a5 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c | |||
| @@ -1904,7 +1904,7 @@ static void dwc3_stop_active_transfer(struct dwc3 *dwc, u32 epnum) | |||
| 1904 | ret = dwc3_send_gadget_ep_cmd(dwc, dep->number, cmd, ¶ms); | 1904 | ret = dwc3_send_gadget_ep_cmd(dwc, dep->number, cmd, ¶ms); |
| 1905 | WARN_ON_ONCE(ret); | 1905 | WARN_ON_ONCE(ret); |
| 1906 | dep->resource_index = 0; | 1906 | dep->resource_index = 0; |
| 1907 | 1907 | dep->flags &= ~DWC3_EP_BUSY; | |
| 1908 | udelay(100); | 1908 | udelay(100); |
| 1909 | } | 1909 | } |
| 1910 | 1910 | ||