summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2014-01-16 13:46:50 -0800
committerKevin Hilman <khilman@linaro.org>2014-01-16 13:46:50 -0800
commit6373bb71875b3f9f73f375952f92e68140b75657 (patch)
tree6384652058f3f76060ab0e3bd5ae62d0500578e3 /arch/arm
parent47482473c8f09f423b98c1e875771c7d0a444296 (diff)
parent4408c26bc37fa8ada493ad41a6c7659b76fff483 (diff)
Merge tag 'davinci-for-v3.14/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc
From Sekhar Nori: A patch to fix the return value of clk_round_rate() * tag 'davinci-for-v3.14/soc' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci: ARM: davinci: clock: return 0 upon error from clk_round_rate()
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-davinci/clock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/clock.c b/arch/arm/mach-davinci/clock.c
index dc9a470ff9c5..985e5fd00fb2 100644
--- a/arch/arm/mach-davinci/clock.c
+++ b/arch/arm/mach-davinci/clock.c
@@ -133,7 +133,7 @@ EXPORT_SYMBOL(clk_get_rate);
long clk_round_rate(struct clk *clk, unsigned long rate)
{
if (clk == NULL || IS_ERR(clk))
- return -EINVAL;
+ return 0;
if (clk->round_rate)
return clk->round_rate(clk, rate);