diff options
author | Sudeep Holla <Sudeep.Holla@arm.com> | 2016-01-21 06:19:29 -0500 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-01-21 20:35:49 -0500 |
commit | 6f16886b7c050c934305b1f285c3458ff1b6e4e4 (patch) | |
tree | 669ac5705eb1de2d5430531c6c74e5c8460125a5 /drivers/cpuidle/cpuidle.c | |
parent | 5bb1729cbdfbe974ad6385be94b14afbac97e19f (diff) |
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 'drivers/cpuidle/cpuidle.c')
-rw-r--r-- | drivers/cpuidle/cpuidle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c index 046423b0c5ca..f996efc56605 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c | |||
@@ -153,7 +153,7 @@ int cpuidle_enter_freeze(struct cpuidle_driver *drv, struct cpuidle_device *dev) | |||
153 | * be frozen safely. | 153 | * be frozen safely. |
154 | */ | 154 | */ |
155 | index = find_deepest_state(drv, dev, UINT_MAX, 0, true); | 155 | index = find_deepest_state(drv, dev, UINT_MAX, 0, true); |
156 | if (index >= 0) | 156 | if (index > 0) |
157 | enter_freeze_proper(drv, dev, index); | 157 | enter_freeze_proper(drv, dev, index); |
158 | 158 | ||
159 | return index; | 159 | return index; |