From: Fabio Estevam <fabio.estevam@freescale.com>
Date: Thu, 6 Nov 2014 14:24:24 +0000 (-0200)
Subject: mx6sabresd: Fix error handling in board_mmc_init()
X-Git-Tag: v2015.01-rc2~79^2~2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=952fdc4e83f44691908aa892c9ff476dbc9371f8;p=oweals%2Fu-boot.git

mx6sabresd: 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>
---

diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
index eda8497ba6..44942ffd75 100644
--- a/board/freescale/mx6sabresd/mx6sabresd.c
+++ b/board/freescale/mx6sabresd/mx6sabresd.c
@@ -257,7 +257,7 @@ int board_mmc_getcd(struct mmc *mmc)
 int board_mmc_init(bd_t *bis)
 {
 #ifndef CONFIG_SPL_BUILD
-	s32 status = 0;
+	int ret;
 	int i;
 
 	/*
@@ -290,13 +290,15 @@ int board_mmc_init(bd_t *bis)
 			printf("Warning: you configured more USDHC controllers"
 			       "(%d) then supported by the board (%d)\n",
 			       i + 1, CONFIG_SYS_FSL_USDHC_NUM);
-			return status;
+			return -EINVAL;
 		}
 
-		status |= fsl_esdhc_initialize(bis, &usdhc_cfg[i]);
+		ret = fsl_esdhc_initialize(bis, &usdhc_cfg[i]);
+		if (ret)
+			return ret;
 	}
 
-	return status;
+	return 0;
 #else
 	unsigned reg = readl(BOOT_CFG) >> 11;
 	/*