Patchwork [U-Boot,1/3] bootm: Handle errors consistently

login
register
mail settings
Submitter Simon Glass
Date July 3, 2013, 2:12 p.m.
Message ID <1372860768-8044-1-git-send-email-sjg@chromium.org>
Download mbox | patch
Permalink /patch/256651/
State Superseded
Delegated to: Tom Rini
Headers show

Comments

Simon Glass - July 3, 2013, 2:12 p.m.
A recent bootm fix left the error path incomplete. Reinstate this so that
failures in bootm stages are handled properly.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 common/cmd_bootm.c | 4 ----
 1 file changed, 4 deletions(-)

Patch

diff --git a/common/cmd_bootm.c b/common/cmd_bootm.c
index 02a5013..f4df0a0 100644
--- a/common/cmd_bootm.c
+++ b/common/cmd_bootm.c
@@ -684,12 +684,8 @@  static int do_bootm_states(cmd_tbl_t *cmdtp, int flag, int argc,
 	if (!ret && (states & BOOTM_STATE_OS_GO)) {
 		ret = boot_selected_os(argc, argv, BOOTM_STATE_OS_GO,
 				images, boot_fn);
-		if (ret)
-			goto err;
 	}
 
-	return ret;
-
 	/* Deal with any fallout */
 err:
 	if (iflag)