From: Shawn Guo shawn.guo@linaro.org
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 (cherry picked from commit 24c7a381720843f17efb42de81f7e85aefd6f616) Signed-off-by: Alex Shi alex.shi@linaro.org --- drivers/thermal/cpu_cooling.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c index 78de794..6093862 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;