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/boundary/nitrogen6x/nitrogen6x.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/boundary/nitrogen6x/nitrogen6x.c')
| -rw-r--r-- | board/boundary/nitrogen6x/nitrogen6x.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c index fcd4d82..e8ea256 100644 --- a/board/boundary/nitrogen6x/nitrogen6x.c +++ b/board/boundary/nitrogen6x/nitrogen6x.c @@ -302,7 +302,7 @@ int board_mmc_getcd(struct mmc *mmc) int board_mmc_init(bd_t *bis) { - s32 status = 0; + int ret; u32 index = 0; 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" "(%d) then supported by the board (%d)\n", 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 |