cmd: load, emit error message for invalid block device
authorHeinrich Schuchardt <xypron.glpk@gmx.de>
Wed, 27 Jan 2021 20:26:43 +0000 (21:26 +0100)
committerTom Rini <trini@konsulko.com>
Mon, 1 Feb 2021 21:32:06 +0000 (16:32 -0500)
The load command should not silently return to the console prompt if an
invalid block device is specified and no file is loaded.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>
fs/fs.c

diff --git a/fs/fs.c b/fs/fs.c
index 68a1555..0c8f577 100644 (file)
--- a/fs/fs.c
+++ b/fs/fs.c
@@ -710,8 +710,10 @@ int do_load(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[],
        if (argc > 7)
                return CMD_RET_USAGE;
 
-       if (fs_set_blk_dev(argv[1], (argc >= 3) ? argv[2] : NULL, fstype))
+       if (fs_set_blk_dev(argv[1], (argc >= 3) ? argv[2] : NULL, fstype)) {
+               log_err("Can't set block device\n");
                return 1;
+       }
 
        if (argc >= 4) {
                addr = simple_strtoul(argv[3], &ep, 16);