From a05f4ab6cc84a92c02ff1dbe2eb8a70161de4cbb Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Fri, 20 Sep 2013 16:30:50 -0300 Subject: mx35pdk: Fix error handling in board_late_init() If smc911x_initialize() fails we should return the error immediately. While at it, also check the error from cpu_eth_init(). Signed-off-by: Fabio Estevam Acked-by: Stefano Babic --- board/freescale/mx35pdk/mx35pdk.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/board/freescale/mx35pdk/mx35pdk.c b/board/freescale/mx35pdk/mx35pdk.c index 427c83a..9fabef5 100644 --- a/board/freescale/mx35pdk/mx35pdk.c +++ b/board/freescale/mx35pdk/mx35pdk.c @@ -251,14 +251,12 @@ int board_late_init(void) int board_eth_init(bd_t *bis) { - int rc = -ENODEV; #if defined(CONFIG_SMC911X) - rc = smc911x_initialize(0, CONFIG_SMC911X_BASE); + int rc = smc911x_initialize(0, CONFIG_SMC911X_BASE); + if (rc) + return rc; #endif - - cpu_eth_init(bis); - - return rc; + return cpu_eth_init(bis); } #if defined(CONFIG_FSL_ESDHC) -- cgit v1.1