diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2014-11-21 16:42:56 -0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-11-24 12:10:18 +0100 |
| commit | e37197acad30928b434c54842642b11ce5f3639b (patch) | |
| tree | f5ea53472b322f636c1c2efaaa75c88c50eec87f /board/bachmann | |
| parent | 44b9841d7898a03e73b5054f56303514a5b35db8 (diff) | |
| download | blackbird-obmc-uboot-e37197acad30928b434c54842642b11ce5f3639b.tar.gz blackbird-obmc-uboot-e37197acad30928b434c54842642b11ce5f3639b.zip | |
ot1200: 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.
Cc: Christian Gmeiner <christian.gmeiner@gmail.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Diffstat (limited to 'board/bachmann')
| -rw-r--r-- | board/bachmann/ot1200/ot1200.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/board/bachmann/ot1200/ot1200.c b/board/bachmann/ot1200/ot1200.c index 007c1ef37d..93f3d65176 100644 --- a/board/bachmann/ot1200/ot1200.c +++ b/board/bachmann/ot1200/ot1200.c @@ -173,7 +173,7 @@ struct fsl_esdhc_cfg usdhc_cfg[2] = { int board_mmc_init(bd_t *bis) { - s32 status = 0; + int ret; u32 index = 0; usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK); @@ -196,13 +196,15 @@ int board_mmc_init(bd_t *bis) printf("Warning: you configured more USDHC controllers" "(%d) then supported by the board (%d)\n", index + 1, CONFIG_SYS_FSL_USDHC_NUM); - return status; + return -EINVAL; } - status |= fsl_esdhc_initialize(bis, &usdhc_cfg[index]); + ret = fsl_esdhc_initialize(bis, &usdhc_cfg[index]); + if (ret) + return ret; } - return status; + return 0; } #define PC MUX_PAD_CTRL(I2C_PAD_CTRL) |
