diff options
| author | Octavian Purdila <octavian.purdila@nxp.com> | 2017-04-11 09:31:33 +0300 |
|---|---|---|
| committer | Leonard Crestez <leonard.crestez@nxp.com> | 2018-08-24 12:41:33 +0300 |
| commit | 720e1f83cd705dd0c486647ca60060da70d84869 (patch) | |
| tree | 723b9399a155e0570d5bae83d368d9e55a328586 /drivers/cpufreq | |
| parent | 129ab82a5719a0f5956a65447795794f23c9cfb9 (diff) | |
MLK-14668 cpufreq: interactive: check index before using it
This also fixes the following warning:
drivers/cpufreq/cpufreq_interactive.c: In function 'choose_freq':
drivers/cpufreq/cpufreq_interactive.c:284:7: warning: 'ret' may be used uninitialized in this function [-Wmaybe-uninitialized]
if (ret)
^
Signed-off-by: Octavian Purdila <octavian.purdila@nxp.com>
Diffstat (limited to 'drivers/cpufreq')
| -rw-r--r-- | drivers/cpufreq/cpufreq_interactive.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/cpufreq/cpufreq_interactive.c b/drivers/cpufreq/cpufreq_interactive.c index 7604733959fd..3ff6f6a599c8 100644 --- a/drivers/cpufreq/cpufreq_interactive.c +++ b/drivers/cpufreq/cpufreq_interactive.c @@ -255,7 +255,7 @@ static unsigned int choose_freq(struct interactive_cpu *icpu, struct cpufreq_frequency_table *freq_table = policy->freq_table; unsigned int prevfreq, freqmin = 0, freqmax = UINT_MAX, tl; unsigned int freq = policy->cur; - int index, ret; + int index; do { prevfreq = freq; @@ -268,6 +268,8 @@ static unsigned int choose_freq(struct interactive_cpu *icpu, index = cpufreq_frequency_table_target(policy, loadadjfreq / tl, CPUFREQ_RELATION_L); + if (index < 0) + break; freq = freq_table[index].frequency; @@ -281,7 +283,7 @@ static unsigned int choose_freq(struct interactive_cpu *icpu, /* Find highest frequency that is less than freqmax */ index = cpufreq_frequency_table_target(policy, freqmax - 1, CPUFREQ_RELATION_H); - if (ret) + if (index < 0) break; freq = freq_table[index].frequency; @@ -305,7 +307,7 @@ static unsigned int choose_freq(struct interactive_cpu *icpu, /* Find lowest frequency that is higher than freqmin */ index = cpufreq_frequency_table_target(policy, freqmin + 1, CPUFREQ_RELATION_L); - if (ret) + if (index < 0) break; freq = freq_table[index].frequency; |