[v3.10-stable,2/3] usb: dwc3: core: fix ordering for PHY suspend

Message ID 1412351841-28107-2-git-send-email-balbi@ti.com
State New
Headers show

Commit Message

Felipe Balbi Oct. 3, 2014, 3:57 p.m.
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)
Cc: <stable@vger.kernel.org> # v3.9+
Suggested-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
 drivers/usb/dwc3/core.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Felipe Balbi Oct. 3, 2014, 4:01 p.m. | #1
On Fri, Oct 03, 2014 at 10:57:20AM -0500, Felipe Balbi wrote:
> 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)
> Cc: <stable@vger.kernel.org> # v3.9+
> Suggested-by: Alan Stern <stern@rowland.harvard.edu>
> Signed-off-by: Felipe Balbi <balbi@ti.com>

this one came out with the wrong commit log. I'll fix it.

Patch

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 358375e..8f26d2d 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -606,9 +606,6 @@  static int dwc3_remove(struct platform_device *pdev)
 	usb_phy_set_suspend(dwc->usb2_phy, 1);
 	usb_phy_set_suspend(dwc->usb3_phy, 1);
 
-	pm_runtime_put(&pdev->dev);
-	pm_runtime_disable(&pdev->dev);
-
 	dwc3_debugfs_exit(dwc);
 
 	switch (dwc->mode) {
@@ -631,6 +628,9 @@  static int dwc3_remove(struct platform_device *pdev)
 	dwc3_free_event_buffers(dwc);
 	dwc3_core_exit(dwc);
 
+	pm_runtime_put(&pdev->dev);
+	pm_runtime_disable(&pdev->dev);
+
 	return 0;
 }