diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2014-10-11 09:28:13 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2014-10-11 09:28:13 +0800 |
| commit | 9ceaa81efd1dd5ec83cf6be5a9445809583a03b6 (patch) | |
| tree | 776b6c713918e2f9c3475570383e37b5a951b6a3 /drivers/thermal | |
| parent | dd634666793e51b43b703161302310326c259d50 (diff) | |
| parent | 26bb0e9a1a938ec98ee07aa76533f1a711fba706 (diff) | |
| download | linux-stable-9ceaa81efd1dd5ec83cf6be5a9445809583a03b6.tar.gz linux-stable-9ceaa81efd1dd5ec83cf6be5a9445809583a03b6.tar.bz2 linux-stable-9ceaa81efd1dd5ec83cf6be5a9445809583a03b6.zip | |
Merge branch 'thermal-core-fix' of .git into next
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/step_wise.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/step_wise.c b/drivers/thermal/step_wise.c index 3b54c2c226d8..fdd1f523a1ed 100644 --- 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 { |