diff options
| author | Marek Vasut <marek.vasut+renesas@mailbox.org> | 2023-03-02 04:08:16 +0100 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2023-03-08 11:40:57 -0800 |
| commit | 9597637f93632d4399f07cd0570a544edd55596a (patch) | |
| tree | 4299a55f8cf931c0874aedbaf3dcb41a80b8d811 /cmd | |
| parent | 45d20f55a178bd00f631460909881176fb12b37d (diff) | |
| download | u-boot-9597637f93632d4399f07cd0570a544edd55596a.tar.gz | |
cmd: fdt: Fix fdt rm behavior on non-existent property and error message space
In case an FDT contains a node '/test-node@1234' , with no property
called 'noprop' in that node, the following command triggers a print
of help message for 'fdt' command instead of erroring out:
=> fdt rm /test-node@1234 noprop
This is because the subcommand errornously returns 'err' instead of
CMD_RET_FAILURE, fix it. Furthermore, align the number of spaces past
fdt_delprop() 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>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/fdt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd/fdt.c b/cmd/fdt.c index 56b3585c3ac..644b58ac4d7 100644 --- a/cmd/fdt.c +++ b/cmd/fdt.c @@ -547,16 +547,16 @@ static int do_fdt(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) if (argc > 3) { err = fdt_delprop(working_fdt, nodeoffset, argv[3]); if (err < 0) { - printf("libfdt fdt_delprop(): %s\n", + printf("libfdt fdt_delprop(): %s\n", fdt_strerror(err)); - return err; + return CMD_RET_FAILURE; } } else { err = fdt_del_node(working_fdt, nodeoffset); if (err < 0) { - printf("libfdt fdt_del_node(): %s\n", + printf("libfdt fdt_del_node(): %s\n", fdt_strerror(err)); - return err; + return CMD_RET_FAILURE; } } |