From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Marco Felsch <m.felsch@pengutronix.de>,
Michael Tretter <m.tretter@pengutronix.de>,
Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH v2 1/5] pbl: fdt: fix fdt_fixup_mem error handling
Date: Wed, 14 Jan 2026 13:00:55 +0100 [thread overview]
Message-ID: <20260114120221.941836-1-a.fatoum@pengutronix.de> (raw)
From: Marco Felsch <m.felsch@pengutronix.de>
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 <m.felsch@pengutronix.de>
Fixes: ae175d4748b1 ("PBL: fdt: add fdt_fixup_mem to fixup memory nodes")
Cc: Michael Tretter <m.tretter@pengutronix.de>
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
v1 - > v2:
- split off preparatory patch from
https://lore.barebox.org/barebox/20251110-v2025-09-0-topic-optee-of-handling-v1-0-8f0625ac5471@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
next reply other threads:[~2026-01-14 12:03 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-14 12:00 Ahmad Fatoum [this message]
2026-01-14 12:00 ` [PATCH v2 2/5] pbl: compressed-dtb: add missing includes Ahmad Fatoum
2026-01-14 12:00 ` [PATCH v2 3/5] ARM: atf: add missing includes in atf_common.h Ahmad Fatoum
2026-01-14 12:00 ` [PATCH v2 4/5] ARM: i.MX8M: cosmetic cleanup Ahmad Fatoum
2026-01-14 12:00 ` [PATCH v2 5/5] pbl: string: add strncmp Ahmad Fatoum
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260114120221.941836-1-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=m.felsch@pengutronix.de \
--cc=m.tretter@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox