[U-Boot] [PATCH] mx5/6: Fix cpu_mmc_init() return value

Benoît Thébaudeau
2012-08-14T15:30:15Z

Do not pretend to have initialized mmc successfully if CONFIG_FSL_ESDHC is not
defined.

Signed-off-by: Beno?t Th?baudeau <benoit.thebaudeau@advansee.com>
Cc: Stefano Babic <sbabic@denx.de>
---
.../arch/arm/cpu/armv7/imx-common/cpu.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)

diff --git u-boot-4d3c95f.orig/arch/arm/cpu/armv7/imx-common/cpu.c u-boot-4d3c95f/arch/arm/cpu/armv7/imx-common/cpu.c
index b3195dd..e736e9a 100644
--- u-boot-4d3c95f.orig/arch/arm/cpu/armv7/imx-common/cpu.c
+++ u-boot-4d3c95f/arch/arm/cpu/armv7/imx-common/cpu.c
@@ -117,11 +117,13 @@ int cpu_eth_init(bd_t *bis)
*/
int cpu_mmc_init(bd_t *bis)
{
+ int rc = -ENODEV;
+
#ifdef CONFIG_FSL_ESDHC
- return fsl_esdhc_mmc_init(bis);
-#else
- return 0;
+ rc = fsl_esdhc_mmc_init(bis);
#endif
+
+ return rc;
}

void reset_cpu(ulong addr)