diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-07-27 19:26:56 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-07-27 19:26:55 -0700 |
| commit | fafc905174f5de95db5745bf89c40842433fef0c (patch) | |
| tree | ddaf2008adf4c386ef4df6143526ebb95abf08eb /drivers/thermal | |
| parent | e3e38c9d587560ff0276bf733ed28022317a6d16 (diff) | |
| parent | f70b8219bbb1bf14c08120b00d1411b9583e9b4f (diff) | |
Merge "msm: thermal: Update the hotplug initialization"
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/msm_thermal.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/thermal/msm_thermal.c b/drivers/thermal/msm_thermal.c index bbc6a8e96d41..ff40d6fad922 100644 --- a/drivers/thermal/msm_thermal.c +++ b/drivers/thermal/msm_thermal.c @@ -3615,7 +3615,7 @@ static int hotplug_init_cpu_offlined(void) int temp = 0; uint32_t cpu = 0; - if (!hotplug_enabled) + if (!hotplug_enabled || !hotplug_task) return 0; mutex_lock(&core_control_mutex); @@ -3632,8 +3632,7 @@ static int hotplug_init_cpu_offlined(void) if (temp >= msm_thermal_info.hotplug_temp_degC) cpus[cpu].offline = 1; - else if (temp <= (msm_thermal_info.hotplug_temp_degC - - msm_thermal_info.hotplug_temp_hysteresis_degC)) + else cpus[cpu].offline = 0; } mutex_unlock(&core_control_mutex); |