wandboard: Fix error handling in board_mmc_init()

PATCH New Fabio Estevam 2 participants 4 messages Nov 15, 2014 – Nov 20, 2014

lore

Share & tools

lore

Fabio Estevam

author

2014-11-15 16:50 UTC #0 lore raw

PATCH 1/2 wandboard: Fix error handling in board_mmc_init()

From: Fabio Estevam <[email protected]>

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 <[email protected]>

---
 board/wandboard/wandboard.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

board/wandboard/wandboard.c +6 -4

index 3c8b7a5..1075c65 100644
@@ -144,7 +144,7 @@ int board_mmc_getcd(struct mmc *mmc)
 
 int board_mmc_init(bd_t *bis)
 {
-	s32 status = 0;
+	int ret;
 	u32 index = 0;
 
 	/*

@@ -173,13 +173,15 @@ int board_mmc_init(bd_t *bis)
 			printf("Warning: you configured more USDHC controllers"
 			       "(%d) then supported by the board (%d)\n",
 			       index + 1, CONFIG_SYS_FSL_USDHC_NUM);
-			return status;
+			return -EINVAL;
 		}
 
-		status |= fsl_esdhc_initialize(bis, &usdhc_cfg[index]);
+		ret = fsl_esdhc_initialize(bis, &usdhc_cfg[index]);
+		if (ret)
+			return ret;
 	}
 
-	return status;
+	return 0;
 }
 
 static int mx6_rgmii_rework(struct phy_device *phydev)

Signature · 1 line

1.9.1

Fabio Estevam

author

2014-11-15 16:50 UTC #1 lore raw

PATCH 2/2 mx53loco: Fix error handling in board_mmc_init()

From: Fabio Estevam <[email protected]>

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 <[email protected]>

---
 board/freescale/mx53loco/mx53loco.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

board/freescale/mx53loco/mx53loco.c +6 -4

index 7569ded..efcf4b3 100644
@@ -186,7 +186,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_ESDHC3_CLK);

@@ -205,12 +205,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

Signature · 1 line

1.9.1

Stefano Babic

2014-11-20 09:40 UTC #2 lore raw

PATCH 2/2 mx53loco: Fix error handling in board_mmc_init()

Quoted 8 lines · Fabio Estevam

From: Fabio Estevam <[email protected]>
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 <[email protected]>
---

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================