[U-Boot] [PATCH v3 007/108] dm: core: Fix offset_to_ofnode() with invalid offset

Simon Glass sjg at chromium.org
Mon Oct 21 03:31:40 UTC 2019


If the offset is -1 this function correct sets up a null ofnode. But if
the offset is any other negative number (e.g. an FDT_ERR) then it does the
wrong thing.

Fix it.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

Changes in v3: None
Changes in v2: None

 include/dm/ofnode.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h
index 5c4cbf09986..4282169706c 100644
--- a/include/dm/ofnode.h
+++ b/include/dm/ofnode.h
@@ -118,7 +118,7 @@ static inline ofnode offset_to_ofnode(int of_offset)
 	if (of_live_active())
 		node.np = NULL;
 	else
-		node.of_offset = of_offset;
+		node.of_offset = of_offset >= 0 ? of_offset : -1;
 
 	return node;
 }
-- 
2.23.0.866.gb869b98d4c-goog



More information about the U-Boot mailing list