| Message ID | 1490692624-11931-2-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | New |
| Headers | show |
| Series | clk: let clk_disable() return immediately if clk is NULL for last 3 clks | expand |
On Tue, Mar 28, 2017 at 11:17 AM, Masahiro Yamada <yamada.masahiro@socionext.com> wrote: > 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> > --- > Applied to next/fixes-non-critical, thanks Arnd
diff --git a/arch/arm/mach-mmp/clock.c b/arch/arm/mach-mmp/clock.c index ac6633d..28fe64c 100644 --- a/arch/arm/mach-mmp/clock.c +++ b/arch/arm/mach-mmp/clock.c @@ -67,6 +67,9 @@ void clk_disable(struct clk *clk) { unsigned long flags; + if (!clk) + return; + WARN_ON(clk->enabled == 0); spin_lock_irqsave(&clocks_lock, flags);
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> --- Changes in v5: - None Changes in v4: - Split into per-arch patches Changes in v3: - Return only when clk is NULL. Do not take care of error pointer. Changes in v2: - Rebase on Linux 4.6-rc1 arch/arm/mach-mmp/clock.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.7.4