colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spl: Drop a duplicate variable in boot_from_devices()

Browse Source 
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")
This commit is contained in:
Simon Glass
2024-12-07 10:24:06 -07:00
committed by Tom Rini
parent 290d0cf0c0
commit fe13e33ddb
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
common/spl/spl.c
View File

@@ -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++) { for (i = 0; i < count && spl_boot_list[i] != BOOT_DEVICE_NONE; i++) {
struct spl_image_loader *loader; struct spl_image_loader *loader;
int bootdev = spl_boot_list[i]; int bootdev = spl_boot_list[i];
int ret;
if (CONFIG_IS_ENABLED(SHOW_ERRORS)) if (CONFIG_IS_ENABLED(SHOW_ERRORS))
ret = -ENXIO; ret = -ENXIO;