Merge branch 'thermal-core-fix' of .git into next

9ceaa81e · Zhang Rui · dd634666 · 26bb0e9a · 9ceaa81e
Commit 9ceaa81e authored Oct 11, 2014 by Zhang Rui
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/thermal/step_wise.c drivers/thermal/step_wise.c +1 -1

No files found.
--- a/drivers/thermal/step_wise.c
+++ b/drivers/thermal/step_wise.c
@@ -77,7 +77,7 @@ static unsigned long get_target_state(struct thermal_instance *instance,
 			next_target = instance->upper;
 		break;
 	case THERMAL_TREND_DROPPING:
-		if (cur_state == instance->lower) {
+		if (cur_state <= instance->lower) {
 			if (!throttle)
 				next_target = THERMAL_NO_TARGET;
 		} else {