From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?utf-8?Q?Beno=C3=AEt_Th=C3=A9baudeau?= Date: Tue, 14 Aug 2012 17:30:15 +0200 (CEST) Subject: [U-Boot] [PATCH] mx5/6: Fix cpu_mmc_init() return value Message-ID: <396451660.2404451.1344958215427.JavaMail.root@advansee.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Do not pretend to have initialized mmc successfully if CONFIG_FSL_ESDHC is not defined. Signed-off-by: Beno?t Th?baudeau Cc: Stefano Babic --- .../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)