diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-01-18 15:26:28 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-01-18 15:26:28 +0800 |
| commit | 2ba51c6d36ee1b43c1f898c6c48ddf3d33e9ab30 (patch) | |
| tree | ff3302dc45a91d7bfcaabd37bfa8fa391a954180 /drivers/thermal/step_wise.c | |
| parent | 28610abf4a574c33ca70e3d7b0e523fdede488d1 (diff) | |
| parent | 90816cc1d4a1d23efe37b74866c6174dd5eab6b5 (diff) | |
Merge remote-tracking branch 'rt-stable/v4.9-rt' into linux-linaro-lsk-v4.9-rtlsk-v4.9-18.02-rt
Conflicts:
arch/arm64/mm/init.c
Diffstat (limited to 'drivers/thermal/step_wise.c')
| -rw-r--r-- | drivers/thermal/step_wise.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/thermal/step_wise.c b/drivers/thermal/step_wise.c index bcef2e7c4ec9..1eea63caa451 100644 --- a/drivers/thermal/step_wise.c +++ b/drivers/thermal/step_wise.c @@ -31,8 +31,7 @@ * If the temperature is higher than a trip point, * a. if the trend is THERMAL_TREND_RAISING, use higher cooling * state for this trip point - * b. if the trend is THERMAL_TREND_DROPPING, use lower cooling - * state for this trip point + * b. if the trend is THERMAL_TREND_DROPPING, do nothing * c. if the trend is THERMAL_TREND_RAISE_FULL, use upper limit * for this trip point * d. if the trend is THERMAL_TREND_DROP_FULL, use lower limit @@ -94,9 +93,11 @@ static unsigned long get_target_state(struct thermal_instance *instance, if (!throttle) next_target = THERMAL_NO_TARGET; } else { - next_target = cur_state - 1; - if (next_target > instance->upper) - next_target = instance->upper; + if (!throttle) { + next_target = cur_state - 1; + if (next_target > instance->upper) + next_target = instance->upper; + } } break; case THERMAL_TREND_DROP_FULL: |