diff options
author | Tom Rini <trini@ti.com> | 2014-11-24 12:02:12 -0500 |
---|---|---|
committer | Tom Rini <trini@ti.com> | 2014-11-24 12:02:12 -0500 |
commit | dee332ffb735f65ab922118791a583c17bb0b795 (patch) | |
tree | d07bc0821792831aa4baeb27868252c2d32c7738 /board/freescale/mx53ard/mx53ard.c | |
parent | 1739564e753bc3a8097f8937a3cbe738bdaaed5d (diff) | |
parent | e7eb277dced570f177d75d56f40219d9dc599ed1 (diff) | |
download | u-boot-imx-dee332ffb735f65ab922118791a583c17bb0b795.zip u-boot-imx-dee332ffb735f65ab922118791a583c17bb0b795.tar.gz u-boot-imx-dee332ffb735f65ab922118791a583c17bb0b795.tar.bz2 |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'board/freescale/mx53ard/mx53ard.c')
-rw-r--r-- | board/freescale/mx53ard/mx53ard.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/board/freescale/mx53ard/mx53ard.c b/board/freescale/mx53ard/mx53ard.c index c960c44..8ba2728 100644 --- a/board/freescale/mx53ard/mx53ard.c +++ b/board/freescale/mx53ard/mx53ard.c @@ -166,7 +166,7 @@ int board_mmc_init(bd_t *bis) }; u32 index; - s32 status = 0; + int ret; esdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC_CLK); esdhc_cfg[1].sdhc_clk = mxc_get_clock(MXC_ESDHC2_CLK); @@ -185,12 +185,14 @@ int board_mmc_init(bd_t *bis) printf("Warning: you configured more ESDHC controller" "(%d) as supported by the board(2)\n", CONFIG_SYS_FSL_ESDHC_NUM); - return status; + return -EINVAL; } - status |= fsl_esdhc_initialize(bis, &esdhc_cfg[index]); + ret = fsl_esdhc_initialize(bis, &esdhc_cfg[index]); + if (ret) + return ret; } - return status; + return 0; } #endif |