]> git.hungrycats.org Git - linux/commitdiff
usb: dwc3: core: fix ordering for PHY suspend
authorFelipe Balbi <balbi@ti.com>
Wed, 3 Sep 2014 21:13:37 +0000 (16:13 -0500)
committerJiri Slaby <jslaby@suse.cz>
Mon, 13 Oct 2014 13:41:27 +0000 (15:41 +0200)
commit dc99f16f076559235c92d3eb66d03d1310faea08 upstream.

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)
Suggested-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
drivers/usb/dwc3/core.c

index 3ff8bba6503b7d2b7ed6fef0a4d6e6bfd0cfb1aa..6adf845fe3a05943512f2d07d0a7e4762bc587c3 100644 (file)
@@ -581,9 +581,6 @@ static int dwc3_remove(struct platform_device *pdev)
 {
        struct dwc3     *dwc = platform_get_drvdata(pdev);
 
-       usb_phy_set_suspend(dwc->usb2_phy, 1);
-       usb_phy_set_suspend(dwc->usb3_phy, 1);
-
        dwc3_debugfs_exit(dwc);
 
        switch (dwc->dr_mode) {
@@ -604,6 +601,10 @@ static int dwc3_remove(struct platform_device *pdev)
 
        dwc3_event_buffers_cleanup(dwc);
        dwc3_free_event_buffers(dwc);
+
+       usb_phy_set_suspend(dwc->usb2_phy, 1);
+       usb_phy_set_suspend(dwc->usb3_phy, 1);
+
        dwc3_core_exit(dwc);
 
        pm_runtime_put_sync(&pdev->dev);