summaryrefslogtreecommitdiff
path: root/arch/arm/mach-tegra/cpuidle.c
diff options
context:
space:
mode:
authorAlex Frid <afrid@nvidia.com>2012-01-28 16:26:22 -0800
committerRohan Somvanshi <rsomvanshi@nvidia.com>2012-02-03 05:39:39 -0800
commite75f62cd368dab4f754a25e7d4b39803a0f45297 (patch)
tree91cfa15d64431ff999eb23e103170ae29b164223 /arch/arm/mach-tegra/cpuidle.c
parent28a95db482a1b21fc74e3c5e4bae93ad82e581cf (diff)
ARM: tegra: power: Report LP3 state if LP2 is not allowed
Properly report LP3 state to idle governor when LP2 entry is not allowed and LP2 request is redirected to LP3. Reviewed-on: http://git-master/r/77956 Change-Id: If4bdf6b635d7b40a8958dc5357903c4ea563d112 Signed-off-by: Alex Frid <afrid@nvidia.com> Signed-off-by: Varun Wadekar <vwadekar@nvidia.com> Reviewed-on: http://git-master/r/78697 Reviewed-by: Automatic_Commit_Validation_User
Diffstat (limited to 'arch/arm/mach-tegra/cpuidle.c')
-rw-r--r--arch/arm/mach-tegra/cpuidle.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/cpuidle.c b/arch/arm/mach-tegra/cpuidle.c
index bdf45f81f9da..f8a274b5f313 100644
--- a/arch/arm/mach-tegra/cpuidle.c
+++ b/arch/arm/mach-tegra/cpuidle.c
@@ -104,8 +104,10 @@ static int tegra_idle_enter_lp2(struct cpuidle_device *dev,
s64 us;
if (!lp2_in_idle || lp2_disabled_by_suspend ||
- !tegra_lp2_is_allowed(dev, state))
+ !tegra_lp2_is_allowed(dev, state)) {
+ dev->last_state = &dev->states[0];
return tegra_idle_enter_lp3(dev, state);
+ }
local_irq_disable();
enter = ktime_get();