mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH] fixup! bootm: retire bootm_has_initrd
Date: Fri, 14 Feb 2025 21:02:08 +0100	[thread overview]
Message-ID: <20250214200208.1479918-1-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20250214104817.2975052-7-a.fatoum@pengutronix.de>

CI noticed correctly that ret is used uninitialized here.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 arch/kvx/lib/bootm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/kvx/lib/bootm.c b/arch/kvx/lib/bootm.c
index 6c35b68f3d5d..42c15ff27351 100644
--- a/arch/kvx/lib/bootm.c
+++ b/arch/kvx/lib/bootm.c
@@ -70,7 +70,7 @@ static int do_boot_elf(struct image_data *data, struct elf_image *elf)
 	initrd_res = bootm_load_initrd(data, initrd_address);
 	if (IS_ERR(initrd_res)) {
 		printf("Failed to load initrd\n");
-		return ret;
+		return PTR_ERR(initrd_res);
 	} else if (initrd_res) {
 		printf("Loading initrd at 0x%lx\n", initrd_address);
 		if (data->initrd_address == UIMAGE_INVALID_ADDRESS) {
-- 
2.39.5




  reply	other threads:[~2025-02-14 20:02 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-02-14 10:48 [PATCH 0/7] commands: boot: add support for overriding boot artifacts Ahmad Fatoum
2025-02-14 10:48 ` [PATCH 1/7] bootm: add helper functions for checking if FIT image is used Ahmad Fatoum
2025-02-14 10:48 ` [PATCH 2/7] boot: move global.linux.bootargs.dyn. to common code Ahmad Fatoum
2025-02-14 10:48 ` [PATCH 3/7] blspec: don't clobber bootm.image on boot attempt Ahmad Fatoum
2025-02-14 10:48 ` [PATCH 4/7] fastboot: drop useless bootm.image clobber Ahmad Fatoum
2025-02-14 10:48 ` [PATCH 5/7] bootm: don't clobber global.bootm. variables after script boot fails Ahmad Fatoum
2025-02-14 10:48 ` [PATCH 6/7] bootm: retire bootm_has_initrd Ahmad Fatoum
2025-02-14 20:02   ` Ahmad Fatoum [this message]
2025-02-14 10:48 ` [PATCH 7/7] commands: boot: add support for overriding boot artifacts Ahmad Fatoum
2025-02-15 12:29   ` [PATCH] fixup! " Ahmad Fatoum
2025-02-17  9:27 ` [PATCH 0/7] " Sascha Hauer

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=20250214200208.1479918-1-a.fatoum@pengutronix.de \
    --to=a.fatoum@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /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