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

nitrogen6x: 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.

Cc: Eric Nelson <eric.nelson@boundarydevices.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
This commit is contained in:
Fabio Estevam 2014-11-21 16:42:57 -02:00 • committed by Stefano Babic
parent e37197acad
commit 612f2dc026
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/boundary/nitrogen6x/nitrogen6x.c
View file

@ -302,7 +302,7 @@ 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 ret;
u32 index = 0; u32 index = 0;
usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK); 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" printf("Warning: you configured more USDHC controllers"
"(%d) then supported by the board (%d)\n", "(%d) then supported by the board (%d)\n",
index + 1, CONFIG_SYS_FSL_USDHC_NUM); 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 #endif