]> git.baikalelectronics.ru Git - uboot.git/commitdiff
cmd: fdt: Fix fdt rsvmem behavior on non-existent index and error message space
authorMarek Vasut <marek.vasut+renesas@mailbox.org>
Thu, 2 Mar 2023 03:08:17 +0000 (04:08 +0100)
committerSimon Glass <sjg@chromium.org>
Thu, 9 Mar 2023 16:50:47 +0000 (08:50 -0800)
In case 'fdt rsvmem delete index' is passed a non-existent index, one
which does not exist in 'fdt rsvmem print', then the following command
triggers a print of help message for 'fdt' command instead of erroring
out:
=> fdt rsvmem delete 1234
This is because the subcommand errornously returns 'err' instead of
CMD_RET_FAILURE, fix it. Furthermore, align the number of spaces past
fdt_del_mem_rsv() and fdt_add_mem_rsv() in error message with the rest
of the code.

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
cmd/fdt.c

index 644b58ac4d76d002b76176ab73d1bc6549359588..29d748891d0a3055c80a99bd8ced890a769fd4f7 100644 (file)
--- a/cmd/fdt.c
+++ b/cmd/fdt.c
@@ -644,18 +644,18 @@ static int do_fdt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
                        err = fdt_add_mem_rsv(working_fdt, addr, size);
 
                        if (err < 0) {
-                               printf("libfdt fdt_add_mem_rsv():  %s\n",
+                               printf("libfdt fdt_add_mem_rsv(): %s\n",
                                        fdt_strerror(err));
-                               return err;
+                               return CMD_RET_FAILURE;
                        }
                } else if (argv[2][0] == 'd') {
                        unsigned long idx = hextoul(argv[3], NULL);
                        int err = fdt_del_mem_rsv(working_fdt, idx);
 
                        if (err < 0) {
-                               printf("libfdt fdt_del_mem_rsv():  %s\n",
+                               printf("libfdt fdt_del_mem_rsv(): %s\n",
                                        fdt_strerror(err));
-                               return err;
+                               return CMD_RET_FAILURE;
                        }
                } else {
                        /* Unrecognized command */