[PATCH] ARM: omap1: clock: return 0 upon error from clk_round_rate()
Paul Walmsley
paul at pwsan.com
Mon Dec 9 22:24:41 EST 2013
clk_round_rate() should return 0 upon an error, rather than
returning a negative error code. This is because clk_round_rate() is
being changed to return an unsigned return value rather than a signed
value, since some clock sources can generate rates higher than
(2^31)-1 Hz.
Signed-off-by: Paul Walmsley <paul at pwsan.com>
---
Applies on v3.13-rc3. See also:
http://marc.info/?l=linux-arm-kernel&m=138542591313620&w=2
arch/arm/mach-omap1/clock.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap1/clock.c b/arch/arm/mach-omap1/clock.c
index 4f5fd4a084c0..ad9b620a4f30 100644
--- a/arch/arm/mach-omap1/clock.c
+++ b/arch/arm/mach-omap1/clock.c
@@ -250,7 +250,7 @@ long omap1_clk_round_rate_ckctl_arm(struct clk *clk, unsigned long rate)
{
int dsor_exp = calc_dsor_exp(clk, rate);
if (dsor_exp < 0)
- return dsor_exp;
+ return 0;
if (dsor_exp > 3)
dsor_exp = 3;
return clk->parent->rate / (1 << dsor_exp);
@@ -285,7 +285,7 @@ long omap1_round_to_table_rate(struct clk *clk, unsigned long rate)
ref_rate = ck_ref_p->rate;
- highest_rate = -EINVAL;
+ highest_rate = 0;
for (ptr = omap1_rate_table; ptr->rate; ptr++) {
if (!(ptr->flags & cpu_mask))
--
1.8.4.4
More information about the linux-arm-kernel
mailing list