From 952fdc4e83f44691908aa892c9ff476dbc9371f8 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 6 Nov 2014 12:24:24 -0200 Subject: mx6sabresd: Fix error handling in board_mmc_init() When an invalid USDHC port is passed we should return -EINVAL instead of 0. Also, return the error immediately on fsl_esdhc_initialize() failure. Signed-off-by: Fabio Estevam --- board/freescale/mx6sabresd/mx6sabresd.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c index eda8497ba6..44942ffd75 100644 --- a/board/freescale/mx6sabresd/mx6sabresd.c +++ b/board/freescale/mx6sabresd/mx6sabresd.c @@ -257,7 +257,7 @@ int board_mmc_getcd(struct mmc *mmc) int board_mmc_init(bd_t *bis) { #ifndef CONFIG_SPL_BUILD - s32 status = 0; + int ret; int i; /* @@ -290,13 +290,15 @@ int board_mmc_init(bd_t *bis) printf("Warning: you configured more USDHC controllers" "(%d) then supported by the board (%d)\n", i + 1, CONFIG_SYS_FSL_USDHC_NUM); - return status; + return -EINVAL; } - status |= fsl_esdhc_initialize(bis, &usdhc_cfg[i]); + ret = fsl_esdhc_initialize(bis, &usdhc_cfg[i]); + if (ret) + return ret; } - return status; + return 0; #else unsigned reg = readl(BOOT_CFG) >> 11; /* -- cgit