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

Benoît Thébaudeau benoit.thebaudeau at advansee.com
Tue Aug 14 17:30:15 CEST 2012


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

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau at advansee.com>
Cc: Stefano Babic <sbabic at 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)


More information about the U-Boot mailing list