diff options
| author | hongbo.zhang <hongbo.zhang@linaro.com> | 2012-10-30 17:48:58 +0100 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2012-11-07 14:49:43 +0800 |
| commit | 9c51b05a7852183ba9654ca850bee97d38e948d5 (patch) | |
| tree | 614518bc4786689636f889c9e66a3f62f602dadd /drivers/thermal | |
| parent | 6b6519df84afcda294c487bccb83a8caecb48acd (diff) | |
| download | linux-3.10-9c51b05a7852183ba9654ca850bee97d38e948d5.tar.gz linux-3.10-9c51b05a7852183ba9654ca850bee97d38e948d5.tar.bz2 linux-3.10-9c51b05a7852183ba9654ca850bee97d38e948d5.zip | |
Thermal: fix bug of counting cpu frequencies.
In the while loop for counting cpu frequencies, if table[i].frequency equals
CPUFREQ_ENTRY_INVALID, index i won't be increased, so this leads to an endless
loop, what's more the index i cannot be referred as cpu frequencies number if
there is CPUFREQ_ENTRY_INVALID case.
Signed-off-by: hongbo.zhang <hongbo.zhang@linaro.com>
Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Amit Daniel Kachhap <amit.kachhap@linaro.org>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Diffstat (limited to 'drivers/thermal')
| -rw-r--r-- | drivers/thermal/cpu_cooling.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/thermal/cpu_cooling.c b/drivers/thermal/cpu_cooling.c index b6b4c2a3f5b..bfd62b7f32a 100644 --- a/drivers/thermal/cpu_cooling.c +++ b/drivers/thermal/cpu_cooling.c @@ -245,6 +245,7 @@ static int cpufreq_get_max_state(struct thermal_cooling_device *cdev, struct cpumask *maskPtr; unsigned int cpu; struct cpufreq_frequency_table *table; + unsigned long count = 0; mutex_lock(&cooling_cpufreq_lock); list_for_each_entry(cpufreq_device, &cooling_cpufreq_list, node) { @@ -263,13 +264,14 @@ static int cpufreq_get_max_state(struct thermal_cooling_device *cdev, goto return_get_max_state; } - while (table[i].frequency != CPUFREQ_TABLE_END) { + for (i = 0; (table[i].frequency != CPUFREQ_TABLE_END); i++) { if (table[i].frequency == CPUFREQ_ENTRY_INVALID) continue; - i++; + count++; } - if (i > 0) { - *state = --i; + + if (count > 0) { + *state = --count; ret = 0; } |