| Message ID | 1474221559-21269-1-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | e1ffaa551cfbc5fc86bb6f40d41adb5e5106ab6c |
| Headers | show |
Hi Wan, Ping again. Please pick up this patch! 2016-11-06 0:45 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>: > Hi Wan, > > This patch was acked by you long before, > but it has not been pulled-in yet for some reasons. > > Now the patch was split per platform. > > So, could you apply this patch to your tree, please? > > > 2016-09-19 2:59 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>: >> 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> >> --- >> >> 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-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 2c371ff..ac6fd1a 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); >> -- >> 1.9.1 >> >> >> _______________________________________________ >> linux-arm-kernel mailing list >> linux-arm-kernel@lists.infradead.org >> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > > > > -- > Best Regards > Masahiro Yamada -- Best Regards Masahiro Yamada _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/arch/arm/mach-w90x900/clock.c b/arch/arm/mach-w90x900/clock.c index 2c371ff..ac6fd1a 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);