diff mbox

[U-Boot,1/3] ot1200: Fix error handling in board_mmc_init()

Message ID 1416595378-22255-1-git-send-email-festevam@gmail.com
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show

Commit Message

Fabio Estevam Nov. 21, 2014, 6:42 p.m. UTC 
From: Fabio Estevam <fabio.estevam@freescale.com>

When an invalid USDHC port is passed we should return -EINVAL instead of 0.
    
Also, return the error immediately on fsl_esdhc_initialize() failure.

Cc: Christian Gmeiner <christian.gmeiner@gmail.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 board/bachmann/ot1200/ot1200.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

Comments

Stefano Babic Nov. 24, 2014, 11:05 a.m. UTC | #1 
On 21/11/2014 19:42, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> When an invalid USDHC port is passed we should return -EINVAL instead of 0.
>     
> Also, return the error immediately on fsl_esdhc_initialize() failure.
> 
> Cc: Christian Gmeiner <christian.gmeiner@gmail.com>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---


Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic
Christian Gmeiner Nov. 24, 2014, 11:07 a.m. UTC | #2 
2014-11-24 12:05 GMT+01:00 Stefano Babic <sbabic@denx.de>:
> On 21/11/2014 19:42, Fabio Estevam wrote:
>> From: Fabio Estevam <fabio.estevam@freescale.com>
>>
>> When an invalid USDHC port is passed we should return -EINVAL instead of 0.
>>
>> Also, return the error immediately on fsl_esdhc_initialize() failure.
>>
>> Cc: Christian Gmeiner <christian.gmeiner@gmail.com>
>> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
>> ---
>
>
> Applied to u-boot-imx, thanks !
>

Thanks Fabio for the patch!

greets
--
Christian Gmeiner, MSc

https://soundcloud.com/christian-gmeiner
diff mbox

Patch

diff --git a/board/bachmann/ot1200/ot1200.c b/board/bachmann/ot1200/ot1200.c
index 007c1ef..93f3d65 100644
--- a/board/bachmann/ot1200/ot1200.c
+++ b/board/bachmann/ot1200/ot1200.c
@@ -173,7 +173,7 @@  struct fsl_esdhc_cfg usdhc_cfg[2] = {
 
 int board_mmc_init(bd_t *bis)
 {
-	s32 status = 0;
+	int ret;
 	u32 index = 0;
 
 	usdhc_cfg[0].sdhc_clk = mxc_get_clock(MXC_ESDHC3_CLK);
@@ -196,13 +196,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;
 }
 
 #define PC MUX_PAD_CTRL(I2C_PAD_CTRL)