diff options
author | Felipe Balbi <balbi@ti.com> | 2014-09-03 17:13:37 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2014-09-03 17:50:44 -0400 |
commit | dc99f16f076559235c92d3eb66d03d1310faea08 (patch) | |
tree | 908906b807acccfa0ba57ed7f47c3c379a8504ba /drivers/usb | |
parent | fed33afce0eda44a46ae24d93aec1b5198c0bac4 (diff) |
usb: dwc3: core: fix ordering for PHY suspend
We can't suspend the PHYs before dwc3_core_exit_mode()
has been called, that's because the host and/or device
sides might still need to communicate with the far end
link partner.
Fixes: 8ba007a (usb: dwc3: core: enable the USB2 and USB3 phy in probe)
Cc: <stable@vger.kernel.org> # v3.9+
Suggested-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/dwc3/core.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index a664d5b5bdfd..9069984fe5cf 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c | |||
@@ -799,15 +799,16 @@ static int dwc3_remove(struct platform_device *pdev) | |||
799 | { | 799 | { |
800 | struct dwc3 *dwc = platform_get_drvdata(pdev); | 800 | struct dwc3 *dwc = platform_get_drvdata(pdev); |
801 | 801 | ||
802 | dwc3_debugfs_exit(dwc); | ||
803 | dwc3_core_exit_mode(dwc); | ||
804 | dwc3_event_buffers_cleanup(dwc); | ||
805 | dwc3_free_event_buffers(dwc); | ||
806 | |||
802 | usb_phy_set_suspend(dwc->usb2_phy, 1); | 807 | usb_phy_set_suspend(dwc->usb2_phy, 1); |
803 | usb_phy_set_suspend(dwc->usb3_phy, 1); | 808 | usb_phy_set_suspend(dwc->usb3_phy, 1); |
804 | phy_power_off(dwc->usb2_generic_phy); | 809 | phy_power_off(dwc->usb2_generic_phy); |
805 | phy_power_off(dwc->usb3_generic_phy); | 810 | phy_power_off(dwc->usb3_generic_phy); |
806 | 811 | ||
807 | dwc3_debugfs_exit(dwc); | ||
808 | dwc3_core_exit_mode(dwc); | ||
809 | dwc3_event_buffers_cleanup(dwc); | ||
810 | dwc3_free_event_buffers(dwc); | ||
811 | dwc3_core_exit(dwc); | 812 | dwc3_core_exit(dwc); |
812 | 813 | ||
813 | pm_runtime_put_sync(&pdev->dev); | 814 | pm_runtime_put_sync(&pdev->dev); |