* [U-Boot] [PATCH 2/5] mx6qarm2: Fix error handling in board_mmc_init()
2014-11-20 18:35 [U-Boot] [PATCH 1/5] mx51evk: Fix error handling in board_mmc_init() Fabio Estevam
@ 2014-11-20 18:35 ` Fabio Estevam
2014-11-20 18:35 ` [U-Boot] [PATCH 3/5] mx53smd: " Fabio Estevam
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Fabio Estevam @ 2014-11-20 18:35 UTC (permalink / raw)
To: u-boot
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.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
board/freescale/mx6qarm2/mx6qarm2.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/board/freescale/mx6qarm2/mx6qarm2.c b/board/freescale/mx6qarm2/mx6qarm2.c
index 667dca5..3a5b26d 100644
--- a/board/freescale/mx6qarm2/mx6qarm2.c
+++ b/board/freescale/mx6qarm2/mx6qarm2.c
@@ -125,7 +125,7 @@ int board_mmc_getcd(struct mmc *mmc)
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);
@@ -145,13 +145,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;
}
#endif
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [PATCH 3/5] mx53smd: Fix error handling in board_mmc_init()
2014-11-20 18:35 [U-Boot] [PATCH 1/5] mx51evk: Fix error handling in board_mmc_init() Fabio Estevam
2014-11-20 18:35 ` [U-Boot] [PATCH 2/5] mx6qarm2: " Fabio Estevam
@ 2014-11-20 18:35 ` Fabio Estevam
2014-11-20 18:35 ` [U-Boot] [PATCH 4/5] mx53evk: " Fabio Estevam
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Fabio Estevam @ 2014-11-20 18:35 UTC (permalink / raw)
To: u-boot
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.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
board/freescale/mx53smd/mx53smd.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/board/freescale/mx53smd/mx53smd.c b/board/freescale/mx53smd/mx53smd.c
index d64c674..0963fd7 100644
--- a/board/freescale/mx53smd/mx53smd.c
+++ b/board/freescale/mx53smd/mx53smd.c
@@ -106,7 +106,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);
@@ -121,12 +121,14 @@ int board_mmc_init(bd_t *bis)
printf("Warning: you configured more ESDHC controller"
"(%d) as supported by the board(1)\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
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [PATCH 4/5] mx53evk: Fix error handling in board_mmc_init()
2014-11-20 18:35 [U-Boot] [PATCH 1/5] mx51evk: Fix error handling in board_mmc_init() Fabio Estevam
2014-11-20 18:35 ` [U-Boot] [PATCH 2/5] mx6qarm2: " Fabio Estevam
2014-11-20 18:35 ` [U-Boot] [PATCH 3/5] mx53smd: " Fabio Estevam
@ 2014-11-20 18:35 ` Fabio Estevam
2014-11-20 18:35 ` [U-Boot] [PATCH 5/5] mx53ard: " Fabio Estevam
2014-11-21 15:47 ` [U-Boot] [PATCH 1/5] mx51evk: " Stefano Babic
4 siblings, 0 replies; 6+ messages in thread
From: Fabio Estevam @ 2014-11-20 18:35 UTC (permalink / raw)
To: u-boot
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.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
board/freescale/mx53evk/mx53evk.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/board/freescale/mx53evk/mx53evk.c b/board/freescale/mx53evk/mx53evk.c
index 13519e2..6ee6d73 100644
--- a/board/freescale/mx53evk/mx53evk.c
+++ b/board/freescale/mx53evk/mx53evk.c
@@ -195,7 +195,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);
@@ -214,12 +214,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
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [PATCH 5/5] mx53ard: Fix error handling in board_mmc_init()
2014-11-20 18:35 [U-Boot] [PATCH 1/5] mx51evk: Fix error handling in board_mmc_init() Fabio Estevam
` (2 preceding siblings ...)
2014-11-20 18:35 ` [U-Boot] [PATCH 4/5] mx53evk: " Fabio Estevam
@ 2014-11-20 18:35 ` Fabio Estevam
2014-11-21 15:47 ` [U-Boot] [PATCH 1/5] mx51evk: " Stefano Babic
4 siblings, 0 replies; 6+ messages in thread
From: Fabio Estevam @ 2014-11-20 18:35 UTC (permalink / raw)
To: u-boot
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.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
board/freescale/mx53ard/mx53ard.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/board/freescale/mx53ard/mx53ard.c b/board/freescale/mx53ard/mx53ard.c
index c960c44..8ba2728 100644
--- a/board/freescale/mx53ard/mx53ard.c
+++ b/board/freescale/mx53ard/mx53ard.c
@@ -166,7 +166,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_ESDHC2_CLK);
@@ -185,12 +185,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
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* [U-Boot] [PATCH 1/5] mx51evk: Fix error handling in board_mmc_init()
2014-11-20 18:35 [U-Boot] [PATCH 1/5] mx51evk: Fix error handling in board_mmc_init() Fabio Estevam
` (3 preceding siblings ...)
2014-11-20 18:35 ` [U-Boot] [PATCH 5/5] mx53ard: " Fabio Estevam
@ 2014-11-21 15:47 ` Stefano Babic
4 siblings, 0 replies; 6+ messages in thread
From: Stefano Babic @ 2014-11-21 15:47 UTC (permalink / raw)
To: u-boot
On 20/11/2014 19:35, 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.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---
For the whole series:
Applied to u-boot-imx, thanks !
Best regards,
Stefano Babic
--
=====================================================================
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
=====================================================================
^ permalink raw reply [flat|nested] 6+ messages in thread