aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSteven Miao <realmz6@gmail.com>2014-01-28 23:25:39 -0500
committerSteven Miao <realmz6@gmail.com>2014-01-29 02:11:26 -0500
commitb48b3a390629945f5a131b210931416cf243f58d (patch)
tree81fe5ec031f3b9e340bba780c3182f3cea03e6d4 /arch
parent5e98c0990471fa1ee707f5c3a6f5183355b19828 (diff)
From: Paul Walmsley <pwalmsley@nvidia.com>
blackfin: bf60x: clock: return 0 upon error from clk_round_rate() 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 type rather than a signed type, since some clock sources can generate rates higher than (2^31)-1 Hz. Signed-off-by: Paul Walmsley <pwalmsley@nvidia.com> Signed-off-by: Steven Miao <realmz6@gmail.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/blackfin/mach-bf609/clock.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/blackfin/mach-bf609/clock.c b/arch/blackfin/mach-bf609/clock.c
index dab8849af884..13644ed25489 100644
--- a/arch/blackfin/mach-bf609/clock.c
+++ b/arch/blackfin/mach-bf609/clock.c
@@ -120,6 +120,7 @@ void clk_disable(struct clk *clk)
120} 120}
121EXPORT_SYMBOL(clk_disable); 121EXPORT_SYMBOL(clk_disable);
122 122
123
123unsigned long clk_get_rate(struct clk *clk) 124unsigned long clk_get_rate(struct clk *clk)
124{ 125{
125 unsigned long ret = 0; 126 unsigned long ret = 0;
@@ -131,7 +132,7 @@ EXPORT_SYMBOL(clk_get_rate);
131 132
132long clk_round_rate(struct clk *clk, unsigned long rate) 133long clk_round_rate(struct clk *clk, unsigned long rate)
133{ 134{
134 long ret = -EIO; 135 long ret = 0;
135 if (clk->ops && clk->ops->round_rate) 136 if (clk->ops && clk->ops->round_rate)
136 ret = clk->ops->round_rate(clk, rate); 137 ret = clk->ops->round_rate(clk, rate);
137 return ret; 138 return ret;