From b3328e4c67b44588b4cecfde3a05b593153f91ef Mon Sep 17 00:00:00 2001 From: Benoit Goby Date: Tue, 18 Jan 2011 12:56:16 -0800 Subject: [PATCH] usb: host: tegra: Fix resuming low speed devices from lp0 Change-Id: I9576853bbe0fae52c5c2cfab26ce8f2017077d4e Signed-off-by: Benoit Goby --- drivers/usb/host/ehci-tegra.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c index 2341904808bc..db61c60ffbab 100644 --- a/drivers/usb/host/ehci-tegra.c +++ b/drivers/usb/host/ehci-tegra.c @@ -265,7 +265,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. */ @@ -341,10 +341,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; } -- 2.34.1