From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Tue, 28 Mar 2017 09:17:03 +0000 (+0900)
Subject: ARM: w90x900: let clk_disable() return immediately if clk is NULL
X-Git-Tag: v4.12-rc1~58^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e1ffaa551cfbc5fc86bb6f40d41adb5e5106ab6c;p=thirdparty%2Flinux.git

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 <yamada.masahiro@socionext.com>
Acked-by: Wan Zongshun <mcuos.com@gmail.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

diff --git a/arch/arm/mach-w90x900/clock.c b/arch/arm/mach-w90x900/clock.c
index 2c371ff22e517..ac6fd1a2cb59f 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);