summaryrefslogtreecommitdiff
path: root/arch/m68k
diff options
context:
space:
mode:
authorJonas Gorski <jonas.gorski@gmail.com>2017-07-18 13:17:25 +0300
committerGreg Ungerer <gerg@linux-m68k.org>2017-08-28 03:40:30 +0300
commit94b282267c2f3af725b154c91275ed374c1f11de (patch)
tree03c879d7c47a6787a8f5c7fd0a8f926b6148686c /arch/m68k
parentcc4a41fe5541a73019a864883297bd5043aa6d98 (diff)
downloadlinux-94b282267c2f3af725b154c91275ed374c1f11de.tar.xz
m68k: 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: facdf0ed4f59 ("m68knommu: introduce basic clk infrastructure") Cc: Greg Ungerer <gerg@linux-m68k.org> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: linux-m68k@lists.linux-m68k.org Cc: linux-kernel@vger.kernel.org Reported-by: Mathias Kresin <dev@kresin.me> Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/coldfire/clk.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/m68k/coldfire/clk.c b/arch/m68k/coldfire/clk.c
index 1e3c7e9193d1..856069a3196d 100644
--- a/arch/m68k/coldfire/clk.c
+++ b/arch/m68k/coldfire/clk.c
@@ -121,6 +121,9 @@ EXPORT_SYMBOL(clk_put);
unsigned long clk_get_rate(struct clk *clk)
{
+ if (!clk)
+ return 0;
+
return clk->rate;
}
EXPORT_SYMBOL(clk_get_rate);