From e75f62cd368dab4f754a25e7d4b39803a0f45297 Mon Sep 17 00:00:00 2001 From: Alex Frid Date: Sat, 28 Jan 2012 16:26:22 -0800 Subject: 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 Signed-off-by: Varun Wadekar Reviewed-on: http://git-master/r/78697 Reviewed-by: Automatic_Commit_Validation_User --- arch/arm/mach-tegra/cpuidle.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'arch/arm/mach-tegra/cpuidle.c') 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(); -- cgit v1.2.3