summaryrefslogtreecommitdiffstats
path: root/drivers/thermal
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2013-05-28 08:22:32 +0200
committerZhang Rui <rui.zhang@intel.com>2013-05-28 08:49:31 +0200
commit24c7a381720843f17efb42de81f7e85aefd6f616 (patch)
tree6deb8d5f54bf300f2de7c5de76e8d8e2fb1bfded /drivers/thermal
parentMerge tag 'trace-fixes-v3.10-rc1' of git://git.kernel.org/pub/scm/linux/kerne... (diff)
downloadlinux-24c7a381720843f17efb42de81f7e85aefd6f616.tar.xz
linux-24c7a381720843f17efb42de81f7e85aefd6f616.zip
thermal: cpu_cooling: fix 'descend' check in get_property()
The variable 'descend' is initialized as -1 in function get_property(), and will never get any chance to be updated by the following code. if (freq != CPUFREQ_ENTRY_INVALID && descend != -1) descend = !!(freq > table[i].frequency); This makes function get_property() return the wrong frequency for given cooling level if the frequency table is sorted in ascending. Fix it by correcting the 'descend' check in if-condition to 'descend == -1'. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Diffstat (limited to 'drivers/thermal')
-rw-r--r--drivers/thermal/cpu_cooling.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c
index c94bf2e5de62..82e15dbb3ac7 100644
--- a/drivers/thermal/cpu_cooling.c
+++ b/drivers/thermal/cpu_cooling.c
@@ -167,7 +167,7 @@ static int get_property(unsigned int cpu, unsigned long input,
continue;
/* get the frequency order */
- if (freq != CPUFREQ_ENTRY_INVALID && descend != -1)
+ if (freq != CPUFREQ_ENTRY_INVALID && descend == -1)
descend = !!(freq > table[i].frequency);
freq = table[i].frequency;