From e3a373d659fa1108352fd4376f9dd394157e42b3 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Wed, 15 Aug 2012 20:28:52 +0200
Subject: [PATCH] --- yaml --- r: 328670 b: refs/heads/master c:
 66804c13f7b79fb26cf4848ebac1e865b9aff65c h: refs/heads/master v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/cpuidle/governors/ladder.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 625868782cad..e059c52d9b2d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 62d6ae880e3e76098d5e345decd2dce443975889
+refs/heads/master: 66804c13f7b79fb26cf4848ebac1e865b9aff65c
diff --git a/trunk/drivers/cpuidle/governors/ladder.c b/trunk/drivers/cpuidle/governors/ladder.c
index 2aef26c520bb..9b784051ec12 100644
--- a/trunk/drivers/cpuidle/governors/ladder.c
+++ b/trunk/drivers/cpuidle/governors/ladder.c
@@ -88,6 +88,7 @@ static int ladder_select_state(struct cpuidle_driver *drv,
 
 	/* consider promotion */
 	if (last_idx < drv->state_count - 1 &&
+	    !drv->states[last_idx + 1].disabled &&
 	    !dev->states_usage[last_idx + 1].disable &&
 	    last_residency > last_state->threshold.promotion_time &&
 	    drv->states[last_idx + 1].exit_latency <= latency_req) {
@@ -101,7 +102,8 @@ static int ladder_select_state(struct cpuidle_driver *drv,
 
 	/* consider demotion */
 	if (last_idx > CPUIDLE_DRIVER_STATE_START &&
-	    (dev->states_usage[last_idx].disable ||
+	    (drv->states[last_idx].disabled ||
+	    dev->states_usage[last_idx].disable ||
 	    drv->states[last_idx].exit_latency > latency_req)) {
 		int i;