summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/host/ehci-tegra.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index f44181737025..23931797d1e4 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -269,7 +269,7 @@ static int tegra_usb_resume(struct usb_hcd *hcd)
goto restart;
}
- tegra_ehci_phy_restore_start(tegra->phy);
+ tegra_ehci_phy_restore_start(tegra->phy, context->port_speed);
/* Check if the phy resume from LP0. When the phy resume from LP0
* USB register will be reset. */
@@ -345,10 +345,13 @@ static int tegra_usb_resume(struct usb_hcd *hcd)
}
tegra_ehci_phy_restore_end(tegra->phy);
+
return 0;
restart:
- tegra_ehci_phy_restore_end(tegra->phy);
+ if (context->valid)
+ tegra_ehci_phy_restore_end(tegra->phy);
+
tegra_ehci_restart(hcd);
return 0;
}