V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

ot1200: Fix the error handling in board_eth_init() 

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: Christian Gmeiner <christian.gmeiner@gmail.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
This commit is contained in:
Fabio Estevam 2015-09-11 00:53:52 -03:00 committed by Stefano Babic
parent 747472bb96
commit cbb8f9676c
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
board/bachmann/ot1200/ot1200.c
View File

@ -305,13 +305,13 @@ int board_eth_init(bd_t *bis)
bus = fec_get_miibus(base, -1); bus = fec_get_miibus(base, -1);
if (!bus) if (!bus)
return 0; return -EINVAL;
/* scan phy 0 and 5 */ /* scan phy 0 and 5 */
phydev = phy_find_by_mask(bus, 0x21, PHY_INTERFACE_MODE_RGMII); phydev = phy_find_by_mask(bus, 0x21, PHY_INTERFACE_MODE_RGMII);
if (!phydev) { if (!phydev) {
free(bus); ret = -EINVAL;
return 0; goto free_bus;
} }
/* depending on the phy address we can detect our board version */ /* depending on the phy address we can detect our board version */
@ -322,12 +322,16 @@ int board_eth_init(bd_t *bis)
printf("using phy at %d\n", phydev->addr); printf("using phy at %d\n", phydev->addr);
ret = fec_probe(bis, -1, base, bus, phydev); ret = fec_probe(bis, -1, base, bus, phydev);
if (ret) { if (ret)
printf("FEC MXC: %s:failed\n", __func__); goto free_phydev;
free(phydev);
free(bus);
}
return 0; return 0;
free_phydev:
free(phydev);
free_bus:
free(bus);
return ret;
} }
int board_init(void) int board_init(void)