summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2014-11-15 14:50:26 -0200
committerStefano Babic <sbabic@denx.de>2014-11-20 10:30:19 +0100
commit05beb8e012e8715f551d1fb2f2fa149f2a7dc06a (patch)
tree2a8b11b6c0ce048cf58fd7f15bad907e98a08683
parent3cb4b713e1933f9e3d90766164f952914668daff (diff)
downloadu-boot-imx-05beb8e012e8715f551d1fb2f2fa149f2a7dc06a.zip
u-boot-imx-05beb8e012e8715f551d1fb2f2fa149f2a7dc06a.tar.gz
u-boot-imx-05beb8e012e8715f551d1fb2f2fa149f2a7dc06a.tar.bz2
wandboard: 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/wandboard/wandboard.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/board/wandboard/wandboard.c b/board/wandboard/wandboard.c
index 3c8b7a5..1075c65 100644
--- a/board/wandboard/wandboard.c
+++ b/board/wandboard/wandboard.c
@@ -144,7 +144,7 @@ int board_mmc_getcd(struct mmc *mmc)
int board_mmc_init(bd_t *bis)
{
- s32 status = 0;
+ int ret;
u32 index = 0;
/*
@@ -173,13 +173,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;
}
static int mx6_rgmii_rework(struct phy_device *phydev)