summaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorJonas Gorski <jonas.gorski@gmail.com>2017-07-18 12:17:28 +0200
committerRalf Baechle <ralf@linux-mips.org>2017-09-06 12:36:59 +0200
commit386787b1fcab2dd3d16ca3f46729aaafdef306e3 (patch)
tree2386053469cb95afbe9a157451466bf1a1b71dc9 /arch/mips
parent1b495faec231980b6c719994b24044ccc04ae06c (diff)
downloadop-kernel-dev-386787b1fcab2dd3d16ca3f46729aaafdef306e3.zip
op-kernel-dev-386787b1fcab2dd3d16ca3f46729aaafdef306e3.tar.gz
MIPS: Loongson 2F: 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, as some device drivers rely on this. 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: f8ede0f700f5 ("MIPS: Loongson 2F: Add CPU frequency scaling support") Reported-by: Mathias Kresin <dev@kresin.me> Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/16777/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/loongson64/lemote-2f/clock.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/loongson64/lemote-2f/clock.c b/arch/mips/loongson64/lemote-2f/clock.c
index a78fb65..8281334 100644
--- a/arch/mips/loongson64/lemote-2f/clock.c
+++ b/arch/mips/loongson64/lemote-2f/clock.c
@@ -80,6 +80,9 @@ EXPORT_SYMBOL(clk_disable);
unsigned long clk_get_rate(struct clk *clk)
{
+ if (!clk)
+ return 0;
+
return (unsigned long)clk->rate;
}
EXPORT_SYMBOL(clk_get_rate);
OpenPOWER on IntegriCloud