diff options
| author | Martin Chi <mchi@nvidia.com> | 2014-04-11 23:03:10 -0700 |
|---|---|---|
| committer | Martin Chi <mchi@nvidia.com> | 2014-04-12 04:45:43 -0700 |
| commit | ccefcdcbd9c8513fbb8cafe2b42b0d4288964f68 (patch) | |
| tree | 56a364cf13aad0315c768628fc3eee03961ca170 | |
| parent | 15f372c27c5c5803a3b129e9fd5bfdc791f701ba (diff) | |
Revert "usb: hsic: remove delay added during remote wakeup"
This reverts commit 01f05993129d269b9ee10311a66da6d9fec4e8a8.
Change-Id: Ic3d0bd1051905e8f9a5af9f7f8a97f0e72fe128b
Signed-off-by: Martin Chi <mchi@nvidia.com>
Reviewed-on: http://git-master/r/395471
GVS: Gerrit_Virtual_Submit
| -rw-r--r-- | arch/arm/mach-tegra/tegra11x_usb_phy.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/tegra11x_usb_phy.c b/arch/arm/mach-tegra/tegra11x_usb_phy.c index f137db0ce16c..5af3b5f30a34 100644 --- a/arch/arm/mach-tegra/tegra11x_usb_phy.c +++ b/arch/arm/mach-tegra/tegra11x_usb_phy.c @@ -1639,7 +1639,11 @@ static void uhsic_phy_restore_end(struct tegra_usb_phy *phy) phy->ctrlr_suspended = false; } - if (!irq_disabled) + if (irq_disabled) { + local_irq_restore(flags); + mdelay(25); + local_irq_save(flags); + } else mdelay(10); pmc->pmc_ops->disable_pmc_bus_ctrl(pmc, 1); |