A bug fix just introduced incorrect behavior in the omap2 nand driver, as
found by gcc-6.1:
drivers/mtd/nand/omap2.c: In function 'omap_get_dt_info':
drivers/mtd/nand/omap2.c:1658:2: error: this 'if' clause does not guard...
[-Werror=misleading-indentation]
if (!info->elm_of_node)
^~
drivers/mtd/nand/omap2.c:1660:3: note: ...this statement, but the latter is
misleadingly indented as if it is guarded by the 'if'
if (!info->elm_of_node)
^~
We clearly need to put the indented code into { } braces to get the intended
behavior.
Signed-off-by: Arnd Bergmann <a...@arndb.de>
Fixes: 3bbca2c54f86 ("mtd: nand: omap2: Add check for old elm binding")
---
drivers/mtd/nand/omap2.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c
index a36ad3d146a3..ab7c34096a62 100644
--- a/drivers/mtd/nand/omap2.c
+++ b/drivers/mtd/nand/omap2.c
@@ -1655,10 +1655,11 @@ static int omap_get_dt_info(struct device *dev, struct
omap_nand_info *info)
/* detect availability of ELM module. Won't be present pre-OMAP4 */
info->elm_of_node = of_parse_phandle(child, "ti,elm-id", 0);
- if (!info->elm_of_node)
+ if (!info->elm_of_node) {
info->elm_of_node = of_parse_phandle(child, "elm_id", 0);
if (!info->elm_of_node)
dev_dbg(dev, "ti,elm-id not in DT\n");
+ }
/* select ecc-scheme for NAND */
if (of_property_read_string(child, "ti,nand-ecc-opt", &s)) {
--
2.9.0
