Skip to content

Commit

Permalink
Thermal: Fix bug on cpu_cooling, cooling device's id conflict problem.
Browse files Browse the repository at this point in the history
This patch fixes small bug on cpu_cooling. CPU cooling device has own
id generated with idr mathod. However in the previous version, it swapped
to all same id at last stage of probing as 0. This makes id's collision and
also occures error when it releases that id.

Signed-off-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
  • Loading branch information
Jonghwa Lee authored and Zhang Rui committed Sep 27, 2012
1 parent 79e093c commit a4b6fec
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/thermal/cpu_cooling.c
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ struct thermal_cooling_device *cpufreq_cooling_register(
struct cpufreq_cooling_device *cpufreq_dev = NULL;
unsigned int cpufreq_dev_count = 0, min = 0, max = 0;
char dev_name[THERMAL_NAME_LENGTH];
int ret = 0, id = 0, i;
int ret = 0, i;
struct cpufreq_policy policy;

list_for_each_entry(cpufreq_dev, &cooling_cpufreq_list, node)
Expand Down Expand Up @@ -396,7 +396,6 @@ struct thermal_cooling_device *cpufreq_cooling_register(
kfree(cpufreq_dev);
return ERR_PTR(-EINVAL);
}
cpufreq_dev->id = id;
cpufreq_dev->cool_dev = cool_dev;
cpufreq_dev->cpufreq_state = 0;
mutex_lock(&cooling_cpufreq_lock);
Expand Down

0 comments on commit a4b6fec

Please sign in to comment.