summaryrefslogtreecommitdiff
path: root/board/freescale
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2014-11-20 16:35:20 -0200
committerStefano Babic <sbabic@denx.de>2014-11-21 16:47:55 +0100
commit7bf38161af878935f5c04c503a136dd5d333cd9e (patch)
treeed95a5a544771d80f0d14ad42f57fb089929d88d /board/freescale
parent1abd714de25f47d3b8bfaea9633458aa754e129e (diff)
downloadu-boot-imx-7bf38161af878935f5c04c503a136dd5d333cd9e.zip
u-boot-imx-7bf38161af878935f5c04c503a136dd5d333cd9e.tar.gz
u-boot-imx-7bf38161af878935f5c04c503a136dd5d333cd9e.tar.bz2
mx53ard: 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>
Diffstat (limited to 'board/freescale')
-rw-r--r--board/freescale/mx53ard/mx53ard.c10
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