summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Gorski <jonas.gorski@gmail.com>2017-07-18 12:17:29 +0200
committerRalf Baechle <ralf@linux-mips.org>2017-09-06 12:37:45 +0200
commita18097b7676bf5fb2677bf5e6cc24e721d7c2596 (patch)
treed191fd0ade96ad3f774cea985945b77267697450
parentMIPS: Loongson 2F: allow NULL clock for clk_get_rate (diff)
downloadlinux-a18097b7676bf5fb2677bf5e6cc24e721d7c2596.tar.xz
linux-a18097b7676bf5fb2677bf5e6cc24e721d7c2596.zip
MIPS: ralink: allow NULL clock for clk_get_rate
Make the behaviour of clk_get_rate consistent with common clk's clk_get_rate by accepting NULL clocks as parameter. Some device drivers rely on this, and will cause an OOPS otherwise. Fixes: 3f0a06b0368d ("MIPS: ralink: adds clkdev code") Reported-by: Mathias Kresin <dev@kresin.me> Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> Cc: John Crispin <john@phrozen.org> Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/16778/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/ralink/clk.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/ralink/clk.c b/arch/mips/ralink/clk.c
index eb1c61917eb7..1b7df115eb60 100644
--- a/arch/mips/ralink/clk.c
+++ b/arch/mips/ralink/clk.c
@@ -53,6 +53,9 @@ EXPORT_SYMBOL_GPL(clk_disable);
unsigned long clk_get_rate(struct clk *clk)
{
+ if (!clk)
+ return 0;
+
return clk->rate;
}
EXPORT_SYMBOL_GPL(clk_get_rate);