V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

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>
This commit is contained in:
Soeren Moch 2014-11-20 13:03:32 +01:00 committed by Stefano Babic
parent 593243d3a2
commit 02a32a92d4
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
board/tbs/tbs2910/tbs2910.c
View File

@ -219,15 +219,13 @@ int board_mmc_getcd(struct mmc *mmc)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
s32 status = 0;
int i;
/* /*
* (U-boot device node) (Physical Port) * (U-boot device node) (Physical Port)
* mmc0 SD2 * mmc0 SD2
* mmc1 SD3 * mmc1 SD3
* mmc2 eMMC * mmc2 eMMC
*/ */
int i, ret;
for (i = 0; i < CONFIG_SYS_FSL_USDHC_NUM; i++) { for (i = 0; i < CONFIG_SYS_FSL_USDHC_NUM; i++) {
switch (i) { switch (i) {
case 0: case 0:
@ -251,12 +249,13 @@ int board_mmc_init(bd_t *bis)
printf("Warning: you configured more USDHC controllers" printf("Warning: you configured more USDHC controllers"
"(%d) then supported by the board (%d)\n", "(%d) then supported by the board (%d)\n",
i + 1, CONFIG_SYS_FSL_USDHC_NUM); i + 1, CONFIG_SYS_FSL_USDHC_NUM);
return status; return -EINVAL;
} }
ret = fsl_esdhc_initialize(bis, &usdhc_cfg[i]);
status |= fsl_esdhc_initialize(bis, &usdhc_cfg[i]); if (ret)
return ret;
} }
return status; return 0;
} }
#endif /* CONFIG_FSL_ESDHC */ #endif /* CONFIG_FSL_ESDHC */