diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2014-11-20 16:35:16 -0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-11-21 16:47:54 +0100 |
| commit | d6af507d5a568289a90984541e1b5971ede5cc9c (patch) | |
| tree | 5486986782265a155d7b783c49aa00bda1d4059c | |
| parent | 6c920ee91039ef27fec9e7c5591fa79ad4b4f8d1 (diff) | |
| download | u-boot-imx-d6af507d5a568289a90984541e1b5971ede5cc9c.zip u-boot-imx-d6af507d5a568289a90984541e1b5971ede5cc9c.tar.gz u-boot-imx-d6af507d5a568289a90984541e1b5971ede5cc9c.tar.bz2 | |
mx51evk: 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>
| -rw-r--r-- | board/freescale/mx51evk/mx51evk.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c index 9b43c84..f1e5eb4 100644 --- a/board/freescale/mx51evk/mx51evk.c +++ b/board/freescale/mx51evk/mx51evk.c @@ -320,7 +320,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_ESDHC2_CLK); @@ -340,11 +340,13 @@ 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 |