summaryrefslogtreecommitdiffstats
path: root/drivers/cpuidle/cpuidle.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-05-03 16:09:56 +0200
committerMark Brown <broonie@kernel.org>2016-05-03 16:09:56 +0200
commitbc0868c62bb13834b20a864f684cced1f84a2412 (patch)
tree2c382dcd24ac95f4dbf53d238d3161d6171d8a4b /drivers/cpuidle/cpuidle.c
parentregulator: pwm: Try to avoid voltage error in duty cycle calculation (diff)
parentregulator: pwm: Use pwm_get_args() where appropriate (diff)
downloadlinux-bc0868c62bb13834b20a864f684cced1f84a2412.tar.xz
linux-bc0868c62bb13834b20a864f684cced1f84a2412.zip
Merge branch 'for-4.7/pwm-regulator' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm into regulator-pwm
Diffstat (limited to 'drivers/cpuidle/cpuidle.c')
-rw-r--r--drivers/cpuidle/cpuidle.c2
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)
* be frozen safely.
*/
index = find_deepest_state(drv, dev, UINT_MAX, 0, true);
- if (index >= 0)
+ if (index > 0)
enter_freeze_proper(drv, dev, index);
return index;