From b97894c33eaecbd651d2babb77ef7d80b947c7f6 Mon Sep 17 00:00:00 2001
From: Andrew Bresticker <abrestic@chromium.org>
Date: Tue, 9 Apr 2013 21:59:47 +0000
Subject: [PATCH] --- yaml --- r: 374552 b: refs/heads/master c:
 e79fe642cc21ac922226b5ea9b7975bf329d4e7a h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/drivers/thermal/step_wise.c | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f1faf3d981b1..b7c11ec91fd6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8837295a73f3500b32e18f9862c7bdde0b958648
+refs/heads/master: e79fe642cc21ac922226b5ea9b7975bf329d4e7a
diff --git a/trunk/drivers/thermal/step_wise.c b/trunk/drivers/thermal/step_wise.c
index 407cde3211c1..ca4f79fb72cf 100644
--- a/trunk/drivers/thermal/step_wise.c
+++ b/trunk/drivers/thermal/step_wise.c
@@ -59,9 +59,12 @@ static unsigned long get_target_state(struct thermal_instance *instance,
 
 	switch (trend) {
 	case THERMAL_TREND_RAISING:
-		if (throttle)
+		if (throttle) {
 			cur_state = cur_state < instance->upper ?
 				    (cur_state + 1) : instance->upper;
+			if (cur_state < instance->lower)
+				cur_state = instance->lower;
+		}
 		break;
 	case THERMAL_TREND_RAISE_FULL:
 		if (throttle)
@@ -71,8 +74,11 @@ static unsigned long get_target_state(struct thermal_instance *instance,
 		if (cur_state == instance->lower) {
 			if (!throttle)
 				cur_state = -1;
-		} else
+		} else {
 			cur_state -= 1;
+			if (cur_state > instance->upper)
+				cur_state = instance->upper;
+		}
 		break;
 	case THERMAL_TREND_DROP_FULL:
 		if (cur_state == instance->lower) {