diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2014-11-21 16:42:57 -0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-11-24 12:10:18 +0100 |
| commit | 612f2dc026548466adf55268b9faaea108b15ec8 (patch) | |
| tree | f1e03aac58b2fde7d74d6846a0291c0c00ecd22b | |
| parent | e37197acad30928b434c54842642b11ce5f3639b (diff) | |
| download | u-boot-imx-612f2dc026548466adf55268b9faaea108b15ec8.zip u-boot-imx-612f2dc026548466adf55268b9faaea108b15ec8.tar.gz u-boot-imx-612f2dc026548466adf55268b9faaea108b15ec8.tar.bz2 | |
nitrogen6x: 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: Eric Nelson <eric.nelson@boundarydevices.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
| -rw-r--r-- | board/boundary/nitrogen6x/nitrogen6x.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c index fcd4d82..e8ea256 100644 --- a/board/boundary/nitrogen6x/nitrogen6x.c +++ b/board/boundary/nitrogen6x/nitrogen6x.c @@ -302,7 +302,7 @@ int board_mmc_getcd(struct mmc *mmc) 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); @@ -325,13 +325,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; } #endif |