summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2014-11-20 16:35:17 -0200
committerStefano Babic <sbabic@denx.de>2014-11-21 16:47:54 +0100
commita49c44dd8bcabb52cb59f7f251ff5b66c08c3213 (patch)
treed7a1391806f1d013bc9c12d51d3fe96f2825b6d8
parentd6af507d5a568289a90984541e1b5971ede5cc9c (diff)
downloadu-boot-imx-a49c44dd8bcabb52cb59f7f251ff5b66c08c3213.zip
u-boot-imx-a49c44dd8bcabb52cb59f7f251ff5b66c08c3213.tar.gz
u-boot-imx-a49c44dd8bcabb52cb59f7f251ff5b66c08c3213.tar.bz2
mx6qarm2: 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. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
-rw-r--r--board/freescale/mx6qarm2/mx6qarm2.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/board/freescale/mx6qarm2/mx6qarm2.c b/board/freescale/mx6qarm2/mx6qarm2.c
index 667dca5..3a5b26d 100644
--- a/board/freescale/mx6qarm2/mx6qarm2.c
+++ b/board/freescale/mx6qarm2/mx6qarm2.c
@@ -125,7 +125,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);
@@ -145,13 +145,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