From: Simon Glass <sjg@chromium.org>
Date: Sat, 7 Dec 2024 17:24:06 +0000 (-0700)
Subject: spl: Drop a duplicate variable in boot_from_devices()
X-Git-Tag: v2025.04-rc1~17^2~61^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe13e33ddbc95738c51a287934094829eb986763;p=pandora-u-boot.git

spl: Drop a duplicate variable in boot_from_devices()

The variable 'ret' is defined twice, which is not intended. This may
have been a local merge error.

Signed-off-by: Simon Glass <sjg@chromium.org>
Fixes: 2eefeb6d893 ("spl: Report a loader failure")
---

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 702920bd2f7..ad31a2f8b6c 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -612,7 +612,6 @@ static int boot_from_devices(struct spl_image_info *spl_image,
 	for (i = 0; i < count && spl_boot_list[i] != BOOT_DEVICE_NONE; i++) {
 		struct spl_image_loader *loader;
 		int bootdev = spl_boot_list[i];
-		int ret;
 
 		if (CONFIG_IS_ENABLED(SHOW_ERRORS))
 			ret = -ENXIO;