summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorSudeep Holla <Sudeep.Holla@arm.com>2016-01-21 11:19:29 +0000
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2016-01-22 02:35:49 +0100
commit6f16886b7c050c934305b1f285c3458ff1b6e4e4 (patch)
tree669ac5705eb1de2d5430531c6c74e5c8460125a5 /kernel
parent5bb1729cbdfbe974ad6385be94b14afbac97e19f (diff)
downloadlinux-6f16886b7c050c934305b1f285c3458ff1b6e4e4.tar.bz2
cpuidle: fix fallback mechanism for suspend to idle in absence of enter_freeze
Commit 51164251f5c3 "sched / idle: Drop default_idle_call() fallback from call_cpuidle()" made find_deepest_state() return non-negative value and check all the states with index > 0. Also as a result, find_deepest_state() returns 0 even when enter_freeze callbacks are not implemented and enter_freeze_proper() is called which ends up crashing the kernel. This patch updates the check for index > 0 in cpuidle_enter_freeze and cpuidle_idle_call(when idle_should_freeze is true) to restore the suspend-to-idle functionality in absence of enter_freeze callback. Fixes: 51164251f5c3 "sched / idle: Drop default_idle_call() fallback from call_cpuidle()" Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched/idle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c
index 34852ee70d54..30f7b6ad3920 100644
--- a/kernel/sched/idle.c
+++ b/kernel/sched/idle.c
@@ -162,7 +162,7 @@ static void cpuidle_idle_call(void)
*/
if (idle_should_freeze()) {
entered_state = cpuidle_enter_freeze(drv, dev);
- if (entered_state >= 0) {
+ if (entered_state > 0) {
local_irq_enable();
goto exit_idle;
}