diff options
| author | Soeren Moch <smoch@web.de> | 2014-11-20 12:03:32 (GMT) |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2014-11-21 14:16:18 (GMT) |
| commit | 02a32a92d4a123c75292a284bdc605c376d204f7 (patch) | |
| tree | 759228d89a0a260eaf3f52b4ca5ec85ebd96595f /board/tbs/tbs2910/tbs2910.c | |
| parent | 593243d3a2aed5a05ead6dc6369b1bd08010d8bc (diff) | |
| download | u-boot-fsl-qoriq-02a32a92d4a123c75292a284bdc605c376d204f7.tar.xz | |
tbs2910: 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.
Based on similar patches by Fabio Estevam for mx6sabresd, mx53loco, wandboard
Signed-off-by: Soeren Moch <smoch@web.de>
Acked-by: Stefano Babic <sbabic@denx.de>
Diffstat (limited to 'board/tbs/tbs2910/tbs2910.c')
| -rw-r--r-- | board/tbs/tbs2910/tbs2910.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/board/tbs/tbs2910/tbs2910.c b/board/tbs/tbs2910/tbs2910.c index daf8ff4..dfa430e 100644 --- a/board/tbs/tbs2910/tbs2910.c +++ b/board/tbs/tbs2910/tbs2910.c @@ -219,15 +219,13 @@ int board_mmc_getcd(struct mmc *mmc) int board_mmc_init(bd_t *bis) { - s32 status = 0; - int i; - /* * (U-boot device node) (Physical Port) * mmc0 SD2 * mmc1 SD3 * mmc2 eMMC */ + int i, ret; for (i = 0; i < CONFIG_SYS_FSL_USDHC_NUM; i++) { switch (i) { case 0: @@ -251,12 +249,13 @@ int board_mmc_init(bd_t *bis) printf("Warning: you configured more USDHC controllers" "(%d) then supported by the board (%d)\n", i + 1, CONFIG_SYS_FSL_USDHC_NUM); - return status; + return -EINVAL; } - - status |= fsl_esdhc_initialize(bis, &usdhc_cfg[i]); + ret = fsl_esdhc_initialize(bis, &usdhc_cfg[i]); + if (ret) + return ret; } - return status; + return 0; } #endif /* CONFIG_FSL_ESDHC */ |