tqma6_mba6: Fix the error handling in board_eth_init()
PATCH 1/2 tqma6_mba6: Fix the error handling in board_eth_init()
From: Fabio Estevam <[email protected]>
We should not return 0 on failure, so return a negative error code instead.
Also centralize the error path so that is easier to follow.
Cc Markus Niebel <[email protected]>
Signed-off-by Fabio Estevam <[email protected]>
--- board/tqc/tqma6/tqma6_mba6.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
board/tqc/tqma6/tqma6_mba6.c +11 -9
@@ -309,24 +309,26 @@ int board_eth_init(bd_t *bis) bus =fec_get_miibus (base,-1 );if (!bus) -return 0 ; +return -EINVAL ;/* scan phy */ phydev =phy_find_by_mask (bus, (0xf <<CONFIG_FEC_MXC_PHYADDR ),PHY_INTERFACE_MODE_RGMII );if (!phydev) { -free (bus); -puts ("No phy found\n" ); -return 0 ; + ret = -EINVAL ; + goto free_bus; } ret =fec_probe (bis,-1 , base, bus, phydev); -if (ret) { -puts ("FEC MXC: probe failed\n" ); -free (phydev); -free (bus); - } +if (ret) + goto free_phydev;return 0 ; + +free_phydev: +free (phydev); +free_bus: +free (bus); +return ret; }int tqma6_bb_board_early_init_f (void )
Signature · 1 line
1.9.1
PATCH 2/2 udoo: Fix the error handling in board_eth_init()
From: Fabio Estevam <[email protected]>
We should not return 0 on failure, so return a negative error code instead.
Also centralize the error path so that is easier to follow.
Signed-off-by Fabio Estevam <[email protected]>
--- board/udoo/udoo.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-)
board/udoo/udoo.c +11 -8
@@ -191,23 +191,26 @@ int board_eth_init(bd_t *bis)#ifdef CONFIG_FEC_MXC bus =fec_get_miibus (base,-1 );if (!bus) -return 0 ; +return -EINVAL ;/* scan phy 4,5,6,7 */ phydev =phy_find_by_mask (bus, (0xf <<4 ),PHY_INTERFACE_MODE_RGMII );if (!phydev) { -free (bus); -return 0 ; + ret = -EINVAL ; + goto free_bus; }printf ("using phy@%d\n" , phydev->addr); ret =fec_probe (bis,-1 , base, bus, phydev); -if (ret) { -printf ("FEC MXC: %s:failed\n" , __func__); -free (phydev); -free (bus); - } +if (ret) + goto free_phydev;#endif return 0 ; + +free_phydev: +free (phydev); +free_bus: +free (bus); +return ret; }int board_mmc_init (bd_t *bis)
Signature · 1 line
1.9.1