Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d36ad7e authored by Suman Anna's avatar Suman Anna Committed by Paul Walmsley
Browse files

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

Bug was introduced by commit 'f92d9597: 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: default avatarRajendra Nayak <rnayak@ti.com>
Signed-off-by: default avatarSuman Anna <s-anna@ti.com>
Signed-off-by: default avatarLokesh Vutla <lokeshvutla@ti.com>
Fixes: f92d9597 ("ARM: OMAP2+: hwmod: Extract no-idle and no-reset info from DT")
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 8e4cb9aa

arch/arm/mach-omap2/omap_hwmod.c

+2 −1
Original line number Diff line number Diff line
@@ -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;