diff options
| author | Jin Qian <jqian@nvidia.com> | 2011-09-02 16:24:01 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:48:51 -0800 |
| commit | bd260e07436ccdd85275cf0eeb42e49c226e0ddb (patch) | |
| tree | 1266a7ae15798a59f4f3aaa042d433f30f8ccb29 /arch/arm/mach-tegra/pm-t3.c | |
| parent | 74f4bf89013bd5b955c77dd30c13e1879889db6c (diff) | |
ARM: tegra: power: do not check time after kernel time suspend
cluster switch for LP0 is called after linux timekeeping suspend,
which turns off timer.
Bug 862504
Change-Id: I5d154248a23fc07a18fdde42eb5308b8c84806fe
Reviewed-on: http://git-master/r/50611
Reviewed-by: Jin Qian <jqian@nvidia.com>
Tested-by: Jin Qian <jqian@nvidia.com>
Reviewed-by: Aleksandr Frid <afrid@nvidia.com>
Reviewed-by: Scott Williams <scwilliams@nvidia.com>
Rebase-Id: R53bc77ecf9e8a14f40d0ff6e76c3589492af297a
Diffstat (limited to 'arch/arm/mach-tegra/pm-t3.c')
| -rw-r--r-- | arch/arm/mach-tegra/pm-t3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/pm-t3.c b/arch/arm/mach-tegra/pm-t3.c index 280275bf3fbb..f41b429d3fcc 100644 --- a/arch/arm/mach-tegra/pm-t3.c +++ b/arch/arm/mach-tegra/pm-t3.c @@ -304,7 +304,7 @@ int tegra_cluster_control(unsigned int us, unsigned int flags) if (flags & TEGRA_POWER_CLUSTER_IMMEDIATE) us = 0; - if (current_cluster != target_cluster) { + if (current_cluster != target_cluster && !timekeeping_suspended) { if (target_cluster == TEGRA_POWER_CLUSTER_G) { s64 t = ktime_to_us(ktime_sub(ktime_get(), last_g2lp)); s64 t_off = tegra_cpu_power_off_time(); |