summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJin Qian <jqian@nvidia.com>2011-09-02 16:24:01 -0700
committerMaria Bornski <mbornski@nvidia.com>2011-09-08 16:21:51 -0700
commit19e34e9413a885c5f444bf16b56e84d4fbe45562 (patch)
treeca58a240ffbb445a44e984a973a8dfd57a1852fb
parent59c781389ad63a87644d92d1eb9866ae7a05039b (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>
-rw-r--r--arch/arm/mach-tegra/pm-t3.c2
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();