diff options
| author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2017-03-28 11:17:03 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-03-30 17:37:19 +0200 |
| commit | e1ffaa551cfbc5fc86bb6f40d41adb5e5106ab6c (patch) | |
| tree | cf722c42c64149953c522571c18681f1802b7b6d /arch/arm/mach-w90x900 | |
| parent | Merge tag 'mvebu-soc-4.12-1' of git://git.infradead.org/linux-mvebu into next... (diff) | |
| download | linux-e1ffaa551cfbc5fc86bb6f40d41adb5e5106ab6c.tar.xz linux-e1ffaa551cfbc5fc86bb6f40d41adb5e5106ab6c.zip | |
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>
Diffstat (limited to 'arch/arm/mach-w90x900')
| -rw-r--r-- | arch/arm/mach-w90x900/clock.c | 3 |
1 files changed, 3 insertions, 0 deletions
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); |