diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2014-11-15 14:50:27 -0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-11-20 10:30:20 +0100 |
| commit | 1769502b5333c209fa60c7eb821be9ce475ef193 (patch) | |
| tree | 13d2ecbdf4dbed6ba8884d46b0bd1048d1d46477 /board/freescale | |
| parent | 05beb8e012e8715f551d1fb2f2fa149f2a7dc06a (diff) | |
| download | u-boot-imx-1769502b5333c209fa60c7eb821be9ce475ef193.zip u-boot-imx-1769502b5333c209fa60c7eb821be9ce475ef193.tar.gz u-boot-imx-1769502b5333c209fa60c7eb821be9ce475ef193.tar.bz2 | |
mx53loco: 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/freescale')
| -rw-r--r-- | board/freescale/mx53loco/mx53loco.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c index 7569ded..efcf4b3 100644 --- a/board/freescale/mx53loco/mx53loco.c +++ b/board/freescale/mx53loco/mx53loco.c @@ -186,7 +186,7 @@ int board_mmc_init(bd_t *bis) }; u32 index; - s32 status = 0; + int ret; esdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK); esdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK); @@ -205,12 +205,14 @@ int board_mmc_init(bd_t *bis) printf("Warning: you configured more ESDHC controller" "(%d) as supported by the board(2)\n", CONFIG_SYS_FSL_ESDHC_NUM); - return status; + return -EINVAL; } - status |= fsl_esdhc_initialize(bis, &esdhc_cfg[index]); + ret = fsl_esdhc_initialize(bis, &esdhc_cfg[index]); + if (ret) + return ret; } - return status; + return 0; } #endif |