summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMartin Chi <mchi@nvidia.com>2014-04-04 14:58:39 +0800
committerRui Zhuo <rzhuo@nvidia.com>2014-04-04 06:46:26 -0700
commit01f05993129d269b9ee10311a66da6d9fec4e8a8 (patch)
treeeb8f97c93efb3bfea68cb4410763679c9f1fcb6d /arch
parent0c9f538699e650233942b8d801a000d5d82f8a66 (diff)
usb: hsic: remove delay added during remote wakeup
bug 1491453 Change-Id: I4c2bc1bdc33fb3669a06f02b136366816c35d1cb Signed-off-by: Martin Chi <mchi@nvidia.com> Reviewed-on: http://git-master/r/392236 Reviewed-by: Suresh Mangipudi <smangipudi@nvidia.com> Reviewed-by: Rui Zhuo <rzhuo@nvidia.com> Tested-by: Rui Zhuo <rzhuo@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-tegra/tegra11x_usb_phy.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/tegra11x_usb_phy.c b/arch/arm/mach-tegra/tegra11x_usb_phy.c
index 5af3b5f30a34..f137db0ce16c 100644
--- a/arch/arm/mach-tegra/tegra11x_usb_phy.c
+++ b/arch/arm/mach-tegra/tegra11x_usb_phy.c
@@ -1639,11 +1639,7 @@ static void uhsic_phy_restore_end(struct tegra_usb_phy *phy)
phy->ctrlr_suspended = false;
}
- if (irq_disabled) {
- local_irq_restore(flags);
- mdelay(25);
- local_irq_save(flags);
- } else
+ if (!irq_disabled)
mdelay(10);
pmc->pmc_ops->disable_pmc_bus_ctrl(pmc, 1);