diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-10-06 12:25:35 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-10-06 12:25:35 -0700 |
| commit | f7ea3ec770fed031d40e040905969dfd5406abcc (patch) | |
| tree | baa22c3eba47b7df8ddc0468ce9db25c88a60217 | |
| parent | b4c777207b1813f0dca52369d62835153911039b (diff) | |
| parent | 7cb6fcfa75ff503fc335eff51eeb7c9504356b2b (diff) | |
Merge "power: qcom: ea: Fix uninitialized temperature and cpu variable"
| -rw-r--r-- | drivers/power/qcom/msm-core.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/power/qcom/msm-core.c b/drivers/power/qcom/msm-core.c index e990425bd63a..727a768e63eb 100644 --- a/drivers/power/qcom/msm-core.c +++ b/drivers/power/qcom/msm-core.c @@ -240,10 +240,10 @@ void trigger_cpu_pwr_stats_calc(void) if (cpu_node->sensor_id < 0) continue; - if (cpu_node->temp == prev_temp[cpu]) + if (cpu_node->temp == prev_temp[cpu]) { sensor_get_temp(cpu_node->sensor_id, &temp); - - cpu_node->temp = temp / scaling_factor; + cpu_node->temp = temp / scaling_factor; + } prev_temp[cpu] = cpu_node->temp; @@ -373,7 +373,7 @@ static int update_userspace_power(struct sched_params __user *argp) { int i; int ret; - int cpu; + int cpu = -1; struct cpu_activity_info *node; struct cpu_static_info *sp, *clear_sp; int cpumask, cluster, mpidr; @@ -396,7 +396,7 @@ static int update_userspace_power(struct sched_params __user *argp) } } - if (cpu >= num_possible_cpus()) + if ((cpu < 0) || (cpu >= num_possible_cpus())) return -EINVAL; node = &activity[cpu]; |