| author | Suman Anna <s-anna@ti.com> | |
| Fri, 14 Mar 2014 09:15:17 +0000 (14:45 +0530) | ||
| committer | Dan Murphy <DMurphy@ti.com> | |
| Sat, 7 Jun 2014 20:50:36 +0000 (15:50 -0500) | ||
| commit | 0ac8e93b5c4022396ba5add7ab57afd100676d4e | |
| tree | 1e0118342333a5da7ae1398c95cc5cc7f8da3195 | tree | snapshot (tar.xz tar.gz zip) |
| parent | 2fd5e57dfcc6e0ba27ccd275d25276f915c4a89c | commit | diff |
ARM: OMAP2+: hwmod: fix missing braces in _init()
[ Upstream commit 3d36ad7e7a9be0d130c862727a052ed279046437 ]
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>
Fixes: f92d9597f781f6a5a39c73dc71604bd8a21c5299 ("ARM: OMAP2+: hwmod: Extract no-idle and no-reset info from DT")
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Dan Murphy <DMurphy@ti.com>
[ Upstream commit 3d36ad7e7a9be0d130c862727a052ed279046437 ]
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>
Fixes: f92d9597f781f6a5a39c73dc71604bd8a21c5299 ("ARM: OMAP2+: hwmod: Extract no-idle and no-reset info from DT")
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Dan Murphy <DMurphy@ti.com>
| arch/arm/mach-omap2/omap_hwmod.c | diff | blob | history |