diff options
| author | Eduardo Valentin <eduardo.valentin@ti.com> | 2013-11-13 18:11:09 (GMT) |
|---|---|---|
| committer | Jia Hongtao <hongtao.jia@freescale.com> | 2015-09-24 07:21:52 (GMT) |
| commit | 6b43e2b8599a5be8904948591d8bca6e676f5eed (patch) | |
| tree | 9e827426684f02476d12f00480245884b2ec1833 | |
| parent | f0a70b99ba5c682eb7f9a86a77b213b557dd2ad6 (diff) | |
| download | linux-fsl-qoriq-6b43e2b8599a5be8904948591d8bca6e676f5eed.tar.xz | |
thermal: fix cpu_cooling max_level behavior
As per Documentation/thermal/sysfs-api.txt, max_level
is an index, not a counter. Thus, in case a CPU has
3 valid frequencies, max_level is expected to be 2, for instance.
The current code makes max_level == number of valid frequencies,
which is bogus. This patch fix the cpu_cooling device by
ranging max_level properly.
Reported-by: Carlos Hernandez <ceh@ti.com>
Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
| -rw-r--r-- | drivers/thermal/cpu_cooling.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c index d179028..d0f8f8b5 100644 --- a/drivers/thermal/cpu_cooling.c +++ b/drivers/thermal/cpu_cooling.c @@ -173,6 +173,8 @@ static int get_property(unsigned int cpu, unsigned long input, freq = table[i].frequency; max_level++; } + /* max_level is an index, not a counter */ + max_level--; /* get max level */ if (property == GET_MAXL) { @@ -181,7 +183,7 @@ static int get_property(unsigned int cpu, unsigned long input, } if (property == GET_FREQ) - level = descend ? input : (max_level - input - 1); + level = descend ? input : (max_level - input); for (i = 0, j = 0; table[i].frequency != CPUFREQ_TABLE_END; i++) { /* ignore invalid entry */ @@ -197,7 +199,7 @@ static int get_property(unsigned int cpu, unsigned long input, if (property == GET_LEVEL && (unsigned int)input == freq) { /* get level by frequency */ - *output = descend ? j : (max_level - j - 1); + *output = descend ? j : (max_level - j); return 0; } if (property == GET_FREQ && level == j) { |