diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-06-25 16:17:21 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-06-25 16:19:06 +0800 |
| commit | bd4e9a26373331ef6f185500c72a8836eb7c82d9 (patch) | |
| tree | 13384e7649be7bb88ab9524efcbc602be85d5020 /drivers/thermal/step_wise.c | |
| parent | 2528dbd348dd541e090594b7aac3f62351078388 (diff) | |
| parent | 2cb9802eeb7f919f97df05b16ec128f4f5af366d (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-androidlsk-v3.14-15.07-android
Conflicts:
fs/exec.c
Solutions:
follow commit d221244a7
sched: move no_new_privs into new atomic flags
to use task_no_new_privs(current).
Diffstat (limited to 'drivers/thermal/step_wise.c')
| -rw-r--r-- | drivers/thermal/step_wise.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/thermal/step_wise.c b/drivers/thermal/step_wise.c index f251521baaa2..ee52ab7d3730 100644 --- a/drivers/thermal/step_wise.c +++ b/drivers/thermal/step_wise.c @@ -146,9 +146,6 @@ static void thermal_zone_trip_update(struct thermal_zone_device *tz, int trip) dev_dbg(&instance->cdev->device, "old_target=%d, target=%d\n", old_target, (int)instance->target); - if (old_target == instance->target) - continue; - /* Activate a passive thermal instance */ if (old_target == THERMAL_NO_TARGET && instance->target != THERMAL_NO_TARGET) |