Browse Source

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()
Kevin Hilman 11 years ago
parent
commit
6373bb7187
1 changed files with 1 additions and 1 deletions
  1. 1 1
      arch/arm/mach-davinci/clock.c

+ 1 - 1
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)
 long clk_round_rate(struct clk *clk, unsigned long rate)
 {
 {
 	if (clk == NULL || IS_ERR(clk))
 	if (clk == NULL || IS_ERR(clk))
-		return -EINVAL;
+		return 0;
 
 
 	if (clk->round_rate)
 	if (clk->round_rate)
 		return clk->round_rate(clk, rate);
 		return clk->round_rate(clk, rate);