diff options
| author | Thomas Betker <thomas.betker@freenet.de> | 2014-06-05 20:07:56 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-06-11 16:25:47 -0400 |
| commit | 73671dad49bf2368959b7bf0e30ba931ea95565c (patch) | |
| tree | ab8bfdab55cc81119814c5eb4a6ff782e88b3705 | |
| parent | 32e2c42a83e8676511e178e0285ea634bc4564fd (diff) | |
| download | blackbird-obmc-uboot-73671dad49bf2368959b7bf0e30ba931ea95565c.tar.gz blackbird-obmc-uboot-73671dad49bf2368959b7bf0e30ba931ea95565c.zip | |
Check run_command() return code properly
run_command() returns 0 for success, 1 for failure. Fix places which
assume that failure is indicated by a negative return code.
Signed-off-by: Thomas Betker <thomas.betker@rohde-schwarz.com>
Acked-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
Tested-by: Stefan Roese <sr@denx.de>
| -rw-r--r-- | arch/arm/cpu/arm926ejs/kirkwood/cpu.c | 2 | ||||
| -rw-r--r-- | board/gdsys/p1022/controlcenterd.c | 6 | ||||
| -rw-r--r-- | common/cmd_bootm.c | 6 |
3 files changed, 3 insertions, 11 deletions
diff --git a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c index 0937506268..da80240052 100644 --- a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c +++ b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c @@ -210,7 +210,7 @@ static void kw_sysrst_action(void) debug("Starting %s process...\n", __FUNCTION__); ret = run_command(s, 0); - if (ret < 0) + if (ret != 0) debug("Error.. %s failed\n", __FUNCTION__); else debug("%s process finished\n", __FUNCTION__); diff --git a/board/gdsys/p1022/controlcenterd.c b/board/gdsys/p1022/controlcenterd.c index 8ccd9ce6ba..642b807e80 100644 --- a/board/gdsys/p1022/controlcenterd.c +++ b/board/gdsys/p1022/controlcenterd.c @@ -221,11 +221,7 @@ void hw_watchdog_reset(void) #ifdef CONFIG_TRAILBLAZER int do_bootd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { - int rcode = 0; - - if (run_command(getenv("bootcmd"), flag) < 0) - rcode = 1; - return rcode; + return run_command(getenv("bootcmd"), flag); } int board_early_init_r(void) diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c index 9b11c0ea18..c06f4b730f 100644 --- a/common/cmd_bootm.c +++ b/common/cmd_bootm.c @@ -1087,11 +1087,7 @@ U_BOOT_CMD( #if defined(CONFIG_CMD_BOOTD) int do_bootd(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { - int rcode = 0; - - if (run_command(getenv("bootcmd"), flag) < 0) - rcode = 1; - return rcode; + return run_command(getenv("bootcmd"), flag); } U_BOOT_CMD( |
