diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2014-11-20 16:35:18 -0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-11-21 16:47:55 +0100 |
| commit | c5ba77ac05eb22b097291eaeb0b956327f1b2b5f (patch) | |
| tree | 7fbdb066aa210545f5886bdd085a261195876888 | |
| parent | a49c44dd8bcabb52cb59f7f251ff5b66c08c3213 (diff) | |
| download | u-boot-c5ba77ac05eb22b097291eaeb0b956327f1b2b5f.tar.gz u-boot-c5ba77ac05eb22b097291eaeb0b956327f1b2b5f.tar.xz u-boot-c5ba77ac05eb22b097291eaeb0b956327f1b2b5f.zip | |
mx53smd: 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/mx53smd/mx53smd.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/board/freescale/mx53smd/mx53smd.c b/board/freescale/mx53smd/mx53smd.c index d64c674e91..0963fd7b43 100644 --- a/board/freescale/mx53smd/mx53smd.c +++ b/board/freescale/mx53smd/mx53smd.c @@ -106,7 +106,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); @@ -121,12 +121,14 @@ int board_mmc_init(bd_t *bis) printf("Warning: you configured more ESDHC controller" "(%d) as supported by the board(1)\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 |