[PATCH v2 12/18] spl: Drop a duplicate variable in boot_from_devices()

Simon Glass sjg at chromium.org
Fri Sep 20 10:12:51 CEST 2024


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

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

(no changes since v1)

 common/spl/spl.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/common/spl/spl.c b/common/spl/spl.c
index 3f432d0fa7a..75938aa63cc 100644
--- a/common/spl/spl.c
+++ b/common/spl/spl.c
@@ -613,7 +613,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;
-- 
2.43.0



More information about the U-Boot mailing list