summaryrefslogtreecommitdiff
path: root/arch/mips
diff options
context:
space:
mode:
authorJonas Gorski <jonas.gorski@gmail.com>2017-07-18 12:17:26 +0200
committerBen Hutchings <ben@decadent.org.uk>2017-11-26 13:50:31 +0000
commit285014c8e18f51bf89de3f39b08c95044edbe935 (patch)
tree79d0346277efd82504287c3cbeb9149fc872889e /arch/mips
parent7b7b5b48e5902f9e07d76d9607ddb9d0b15c8619 (diff)
MIPS: AR7: allow NULL clock for clk_get_rate
commit 585e0e9d02a690c29932b2fc0789835c7b91d448 upstream. 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: 780019ddf02f ("MIPS: AR7: Implement clock API") Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> Reported-by: Mathias Kresin <dev@kresin.me> Cc: Paul Gortmaker <paul.gortmaker@windriver.com> Cc: James Hogan <james.hogan@imgtec.com> Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/16775/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/ar7/clock.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/ar7/clock.c b/arch/mips/ar7/clock.c
index 2460f9d23f1b..320e5b888ad3 100644
--- a/arch/mips/ar7/clock.c
+++ b/arch/mips/ar7/clock.c
@@ -430,6 +430,9 @@ EXPORT_SYMBOL(clk_disable);
unsigned long clk_get_rate(struct clk *clk)
{
+ if (!clk)
+ return 0;
+
return clk->rate;
}
EXPORT_SYMBOL(clk_get_rate);