From: Tom Rini <trini@ti.com>
Date: Mon, 1 Jul 2013 13:09:23 +0000 (-0400)
Subject: cmd_bootm.c: Correct check/return for unsupported sub-command
X-Git-Tag: v2013.07-rc3~19
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c479c1361ade3cf2346f41a922b85373ddff8a26;p=oweals%2Fu-boot.git

cmd_bootm.c: Correct check/return for unsupported sub-command

With the do_bootm_states re-organization, we have the call to any
potential sub-commands in a single spot.  If one fails, we can then stop
right there and return to the caller.  Prior to these calls we have
already ensured that ret is zero so we will not be returning this error
for some other case.

Signed-off-by: Tom Rini <trini@ti.com>
Tested-by: Andreas Bießmann <andreas.devel@googlemail.com>
---

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 02a5013c04..a36e0197f5 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -669,6 +669,13 @@ static int do_bootm_states(cmd_tbl_t *cmdtp, int flag, int argc,
 	if (!ret && (states & BOOTM_STATE_OS_PREP))
 		ret = boot_fn(BOOTM_STATE_OS_PREP, argc, argv, images);
 
+	/* Check for unsupported subcommand. */
+	if (ret) {
+		puts("subcommand not supported\n");
+		return ret;
+	}
+
+
 #ifdef CONFIG_TRACE
 	/* Pretend to run the OS, then run a user command */
 	if (!ret && (states & BOOTM_STATE_OS_FAKE_GO)) {
@@ -699,8 +706,6 @@ err:
 		bootstage_error(BOOTSTAGE_ID_DECOMP_UNIMPL);
 	else if (ret == BOOTM_ERR_RESET)
 		do_reset(cmdtp, flag, argc, argv);
-	else
-		puts("subcommand not supported\n");
 
 	return ret;
 }