diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2014-11-06 12:24:24 -0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-11-13 18:06:13 +0100 |
| commit | 952fdc4e83f44691908aa892c9ff476dbc9371f8 (patch) | |
| tree | 028e18de115b00124bd52e73a11aca7c87b05653 /board | |
| parent | 11076f0cac4cceff78fe673c52b6891ee9286471 (diff) | |
| download | blackbird-obmc-uboot-952fdc4e83f44691908aa892c9ff476dbc9371f8.tar.gz blackbird-obmc-uboot-952fdc4e83f44691908aa892c9ff476dbc9371f8.zip | |
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 <fabio.estevam@freescale.com>
Diffstat (limited to 'board')
| -rw-r--r-- | board/freescale/mx6sabresd/mx6sabresd.c | 10 |
1 files 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; /* |
