]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Thermal: Fix bug on cpu_cooling, cooling device's id conflict problem.
authorJonghwa Lee <jonghwa3.lee@samsung.com>
Wed, 26 Sep 2012 00:43:31 +0000 (09:43 +0900)
committerZhang Rui <rui.zhang@intel.com>
Thu, 27 Sep 2012 06:11:22 +0000 (14:11 +0800)
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>
drivers/thermal/cpu_cooling.c

index 99a5d7551b3395c69b2cf962b6da0627ae6c6cee..9050c1b0573cd8f9f29221afb50c1aa57b491d3c 100644 (file)
@@ -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)
@@ -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);