git.openpandora.org
/
pandora-u-boot.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7a585b9
)
spl: Drop a duplicate variable in boot_from_devices()
author
Simon Glass
<sjg@chromium.org>
Thu, 19 Dec 2024 18:29:01 +0000
(11:29 -0700)
committer
Tom Rini
<trini@konsulko.com>
Fri, 27 Dec 2024 21:16:10 +0000
(15:16 -0600)
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")
common/spl/spl.c
patch
|
blob
|
history
diff --git
a/common/spl/spl.c
b/common/spl/spl.c
index
702920b
..
ad31a2f
100644
(file)
--- 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;