Commit 6373bb71 authored Jan 16, 2014 by Kevin Hilman

Merge tag 'davinci-for-v3.14/soc' of...

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()

parents 47482473 4408c26b

arch/arm/mach-davinci/clock.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);