diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2010-10-17 23:50:29 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-10-18 07:33:10 -0400 |
commit | c2590f4a8ddf461d33ac2085d966432b2a6a09f2 (patch) | |
tree | c0302f29a328b6200517c933db2cb4a94e96be58 /drivers/sh | |
parent | 56ea510962ec690ede2be2064de72e51a33011d9 (diff) |
sh: clkfwk: modify for_each_frequency end condition
The end condition of for_each_frequency should care about
both clk_rate_table_round and clk_rate_div_range_round,
and using "correct max size" is a natural idea in later function.
To avoid data over flow, this patch didn't modify
clk_rate_div_range_round side as .max = div_max + 1.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/sh')
-rw-r--r-- | drivers/sh/clk.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/sh/clk.c b/drivers/sh/clk.c index c76f972db69a..dae64ee9ecc5 100644 --- a/drivers/sh/clk.c +++ b/drivers/sh/clk.c | |||
@@ -82,7 +82,7 @@ struct clk_rate_round_data { | |||
82 | 82 | ||
83 | #define for_each_frequency(pos, r, freq) \ | 83 | #define for_each_frequency(pos, r, freq) \ |
84 | for (pos = r->min, freq = r->func(pos, r); \ | 84 | for (pos = r->min, freq = r->func(pos, r); \ |
85 | pos < r->max; pos++, freq = r->func(pos, r)) \ | 85 | pos <= r->max; pos++, freq = r->func(pos, r)) \ |
86 | if (unlikely(freq == 0)) \ | 86 | if (unlikely(freq == 0)) \ |
87 | ; \ | 87 | ; \ |
88 | else | 88 | else |
@@ -139,12 +139,15 @@ long clk_rate_table_round(struct clk *clk, | |||
139 | { | 139 | { |
140 | struct clk_rate_round_data table_round = { | 140 | struct clk_rate_round_data table_round = { |
141 | .min = 0, | 141 | .min = 0, |
142 | .max = clk->nr_freqs, | 142 | .max = clk->nr_freqs - 1, |
143 | .func = clk_rate_table_iter, | 143 | .func = clk_rate_table_iter, |
144 | .arg = freq_table, | 144 | .arg = freq_table, |
145 | .rate = rate, | 145 | .rate = rate, |
146 | }; | 146 | }; |
147 | 147 | ||
148 | if (clk->nr_freqs < 1) | ||
149 | return 0; | ||
150 | |||
148 | return clk_rate_round_helper(&table_round); | 151 | return clk_rate_round_helper(&table_round); |
149 | } | 152 | } |
150 | 153 | ||