[U-Boot] [PATCH v3 4/5] common/fdt_support.c: avoid unintended return from fdt_fixup_memory_banks()

myan miao.yan at windriver.com
Thu Nov 28 10:51:39 CET 2013


From: Miao Yan <miao.yan at windriver.com>

fdt_fixup_memory_banks() will add and update /memory node in
device tree blob. In the case that /memory node doesn't exist,
after adding a new one, this function returns error.

The correct behavior should be continuing to update its properties.

Signed-off-by: Miao Yan <miao.yan at windriver.com>
---
changes:
 v2->v3: rebase to master: d19ad726bcd5d9106f7ba9c750462fcc369f1020
 v1->v2: none

 common/fdt_support.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/fdt_support.c b/common/fdt_support.c
index 1f0d8f5..4e32b02 100644
--- a/common/fdt_support.c
+++ b/common/fdt_support.c
@@ -400,10 +400,11 @@ int fdt_fixup_memory_banks(void *blob, u64 start[], u64 size[], int banks)
 	nodeoffset = fdt_path_offset(blob, "/memory");
 	if (nodeoffset < 0) {
 		nodeoffset = fdt_add_subnode(blob, 0, "memory");
-		if (nodeoffset < 0)
+		if (nodeoffset < 0) {
 			printf("WARNING: could not create /memory: %s.\n",
 					fdt_strerror(nodeoffset));
-		return nodeoffset;
+			return nodeoffset;
+		}
 	}
 	err = fdt_setprop(blob, nodeoffset, "device_type", "memory",
 			sizeof("memory"));
-- 
1.7.9.5



More information about the U-Boot mailing list