summaryrefslogtreecommitdiff
path: root/common/cli.c
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2023-01-12 10:15:24 -0500
committerTom Rini <trini@konsulko.com>2023-01-12 10:15:24 -0500
commitf58885d002302b8047446a6a15f7376bb7b1ea32 (patch)
treeb87608f2330d6190c3dcfad66eba8e9da5c47de2 /common/cli.c
parentee4f86cc042129abf1b16fcfbf4fc705b03375b6 (diff)
parent85fd48984e670d45eddd86710aa47c38baa738ca (diff)
Merge branch '2023-01-11-assorted-general-updates'
- Assorted Kconfig cleanups, code clean ups, env+ubi updates, correct return value propagation out of environment scripts, and update CI to latest "jammy" tag.
Diffstat (limited to 'common/cli.c')
-rw-r--r--common/cli.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/common/cli.c b/common/cli.c
index a47d6a3f2b4..ba45dad2db5 100644
--- a/common/cli.c
+++ b/common/cli.c
@@ -146,7 +146,7 @@ int run_commandf(const char *fmt, ...)
#if defined(CONFIG_CMD_RUN)
int do_run(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
{
- int i;
+ int i, ret;
if (argc < 2)
return CMD_RET_USAGE;
@@ -160,8 +160,9 @@ int do_run(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[])
return 1;
}
- if (run_command(arg, flag | CMD_FLAG_ENV) != 0)
- return 1;
+ ret = run_command(arg, flag | CMD_FLAG_ENV);
+ if (ret)
+ return ret;
}
return 0;
}