From: Marco Felsch <[email protected]> fdt_find_or_add_memory() returns >= 0 on success, so the return must be checked to be < 0. Also fix the following pr_warn() which used the wrong variable.
Signed-off-by: Marco Felsch <[email protected]> Fixes: ae175d4748b1 ("PBL: fdt: add fdt_fixup_mem to fixup memory nodes") Cc: Michael Tretter <[email protected]> Signed-off-by: Ahmad Fatoum <[email protected]> --- v1 - > v2: - split off preparatory patch from https://lore.barebox.org/barebox/20251110-v2025-09-0-topic-optee-of-handling-v1-0-8f0625ac5...@pengutronix.de/T/#t - Add Fixes: --- pbl/fdt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pbl/fdt.c b/pbl/fdt.c index c9820112c644..ac377446caea 100644 --- a/pbl/fdt.c +++ b/pbl/fdt.c @@ -128,9 +128,9 @@ int fdt_fixup_mem(void *fdt, unsigned long membase[], unsigned long memsize[], snprintf(name, sizeof(name), "memory@%lx", base); node = fdt_find_or_add_memory(fdt, root, name); - if (!node) { + if (node < 0) { pr_warn("%s: Failed to get node: %s\n", - name, fdt_strerror(err)); + name, fdt_strerror(node)); continue; } -- 2.47.3
