diff options
| author |   Axel Lin <axel.lin@ingics.com> | 2013-04-08 11:43:02 +0800 |
|---|---|---|
| committer |   Mike Turquette <mturquette@linaro.org> | 2013-04-08 22:26:36 -0700 |
| commit | 4cb24e68a5af427651b3529cd3fe382fb9ba1544 (patch) | |
| tree | 6d2961ffbf377e4544ecb22a53c4db827b4c5d2b /drivers/clk | |
| parent | clk: Fixup locking issues for clk_set_parent (diff) | |
| download | linux-dev-4cb24e68a5af427651b3529cd3fe382fb9ba1544.tar.xz linux-dev-4cb24e68a5af427651b3529cd3fe382fb9ba1544.zip | |
clk: mvebu: Fix valid value range checking for cpu_freq_select
cpu_freq_select is used as array subscript, thus the valid value range
is 0 ... ARRAY_SIZE() - 1.
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mike Turquette <mturquette@linaro.org>
[mturquette@linaro.org: fixed up trivial merge issues]
Diffstat (limited to 'drivers/clk')
| -rw-r--r-- | drivers/clk/mvebu/clk-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/mvebu/clk-core.c b/drivers/clk/mvebu/clk-core.c index 69056a7479e8..2628610c1929 100644 --- a/drivers/clk/mvebu/clk-core.c +++ b/drivers/clk/mvebu/clk-core.c @@ -156,7 +156,7 @@ static u32 __init armada_370_get_cpu_freq(void __iomem *sar) cpu_freq_select = ((readl(sar) >> SARL_A370_PCLK_FREQ_OPT) & SARL_A370_PCLK_FREQ_OPT_MASK); - if (cpu_freq_select > ARRAY_SIZE(armada_370_cpu_frequencies)) { + if (cpu_freq_select >= ARRAY_SIZE(armada_370_cpu_frequencies)) { pr_err("CPU freq select unsuported %d\n", cpu_freq_select); cpu_freq = 0; } else @@ -278,7 +278,7 @@ static u32 __init armada_xp_get_cpu_freq(void __iomem *sar) cpu_freq_select |= (((readl(sar+4) >> SARH_AXP_PCLK_FREQ_OPT) & SARH_AXP_PCLK_FREQ_OPT_MASK) << SARH_AXP_PCLK_FREQ_OPT_SHIFT); - if (cpu_freq_select > ARRAY_SIZE(armada_xp_cpu_frequencies)) { + if (cpu_freq_select >= ARRAY_SIZE(armada_xp_cpu_frequencies)) { pr_err("CPU freq select unsuported: %d\n", cpu_freq_select); cpu_freq = 0; } else |