From e1ffaa551cfbc5fc86bb6f40d41adb5e5106ab6c Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Tue, 28 Mar 2017 18:17:03 +0900 Subject: [PATCH] ARM: w90x900: let clk_disable() return immediately if clk is NULL In many of clk_disable() implementations, it is a no-op for a NULL pointer input, but this is one of the exceptions. Making it treewide consistent will allow clock consumers to call clk_disable() without NULL pointer check. Signed-off-by: Masahiro Yamada Acked-by: Wan Zongshun Signed-off-by: Arnd Bergmann --- arch/arm/mach-w90x900/clock.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/mach-w90x900/clock.c b/arch/arm/mach-w90x900/clock.c index 2c371ff22e51..ac6fd1a2cb59 100644 --- a/arch/arm/mach-w90x900/clock.c +++ b/arch/arm/mach-w90x900/clock.c @@ -46,6 +46,9 @@ void clk_disable(struct clk *clk) { unsigned long flags; + if (!clk) + return; + WARN_ON(clk->enabled == 0); spin_lock_irqsave(&clocks_lock, flags); -- 2.11.0