[PATCH] ARM: OMAP2+: hwmod: fix missing braces in _init()

[PATCH] ARM: OMAP2+: hwmod: fix missing braces in _init()

[Rajendra Nayak]

From: Suman Anna <s-anna@ti.com>

Bug was introduced by commit 'f92d959: ARM: OMAP2+: hwmod:
Extract no-idle and no-reset info from DT'

There were 2 versions of the patch posted which resulted in the above
commit. While v1 [1] had the bug, v2 [2] had it fixed.
However v1 apparently seemed to have been pulled in by mistake
introducing the bug.

Given of_find_property() does return NULL when the node passed is
NULL, it did not introduce any functional issues as such, just the
fact that the second if check was executed unnecessarily.

[1] https://www.mail-archive.com/linux-omap@vger.kernel.org/msg94220.html
[2] http://www.spinics.net/lists/linux-omap/msg98490.html

Cc: Nishanth Menon <nm@ti.com>
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
 arch/arm/mach-omap2/omap_hwmod.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 1f33f5d..66c60fe 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -2546,11 +2546,12 @@ static int __init _init(struct omap_hwmod *oh, void *data)
 		return -EINVAL;
 	}
 
-	if (np)
+	if (np) {
 		if (of_find_property(np, "ti,no-reset-on-init", NULL))
 			oh->flags |= HWMOD_INIT_NO_RESET;
 		if (of_find_property(np, "ti,no-idle-on-init", NULL))
 			oh->flags |= HWMOD_INIT_NO_IDLE;
+	}
 
 	oh->_state = _HWMOD_STATE_INITIALIZED;
 
-- 
1.7.9.5

Re: [PATCH] ARM: OMAP2+: hwmod: fix missing braces in _init()

[Paul Walmsley]

On Fri, 14 Mar 2014, Rajendra Nayak wrote:

> From: Suman Anna <s-anna@ti.com>
> 
> Bug was introduced by commit 'f92d959: ARM: OMAP2+: hwmod:
> Extract no-idle and no-reset info from DT'
> 
> There were 2 versions of the patch posted which resulted in the above
> commit. While v1 [1] had the bug, v2 [2] had it fixed.
> However v1 apparently seemed to have been pulled in by mistake
> introducing the bug.
> 
> Given of_find_property() does return NULL when the node passed is
> NULL, it did not introduce any functional issues as such, just the
> fact that the second if check was executed unnecessarily.
> 
> [1] https://www.mail-archive.com/linux-omap@vger.kernel.org/msg94220.html
> [2] http://www.spinics.net/lists/linux-omap/msg98490.html
> 
> Cc: Nishanth Menon <nm@ti.com>
> Signed-off-by: Rajendra Nayak <rnayak@ti.com>
> Signed-off-by: Suman Anna <s-anna@ti.com>
> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>

Thanks, queued for v3.15-rc.


- Paul