GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-19 05:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mx6sabresd: Fix error handling in board_mmc_init()

Browse source 
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>
This commit is contained in:
Fabio Estevam 2014-11-06 12:24:24 -02:00 • committed by Stefano Babic
parent 11076f0cac
commit 952fdc4e83
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
board/freescale/mx6sabresd/mx6sabresd.c
View file

@ -257,7 +257,7 @@ int board_mmc_getcd(struct mmc *mmc)
int board_mmc_init(bd_t *bis) int board_mmc_init(bd_t *bis)
{ {
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
s32 status = 0; int ret;
int i; int i;
/* /*
@ -290,13 +290,15 @@ 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;
} }
status |= fsl_esdhc_initialize(bis, &usdhc_cfg[i]); ret = fsl_esdhc_initialize(bis, &usdhc_cfg[i]);
if (ret)
return ret;
} }
return status; return 0;
#else #else
unsigned reg = readl(BOOT_CFG) >> 11; unsigned reg = readl(BOOT_CFG) >> 11;
/* /*