mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 21:21:37 +00:00
udoo: 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. Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
This commit is contained in:
parent
36f5a7f64d
commit
84c311f28e
1 changed files with 11 additions and 8 deletions
|
@ -191,23 +191,26 @@ int board_eth_init(bd_t *bis)
|
||||||
#ifdef CONFIG_FEC_MXC
|
#ifdef CONFIG_FEC_MXC
|
||||||
bus = fec_get_miibus(base, -1);
|
bus = fec_get_miibus(base, -1);
|
||||||
if (!bus)
|
if (!bus)
|
||||||
return 0;
|
return -EINVAL;
|
||||||
/* scan phy 4,5,6,7 */
|
/* scan phy 4,5,6,7 */
|
||||||
phydev = phy_find_by_mask(bus, (0xf << 4), PHY_INTERFACE_MODE_RGMII);
|
phydev = phy_find_by_mask(bus, (0xf << 4), PHY_INTERFACE_MODE_RGMII);
|
||||||
|
|
||||||
if (!phydev) {
|
if (!phydev) {
|
||||||
free(bus);
|
ret = -EINVAL;
|
||||||
return 0;
|
goto free_bus;
|
||||||
}
|
}
|
||||||
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);
|
|
||||||
}
|
|
||||||
#endif
|
#endif
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
free_phydev:
|
||||||
|
free(phydev);
|
||||||
|
free_bus:
|
||||||
|
free(bus);
|
||||||
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
int board_mmc_init(bd_t *bis)
|
int board_mmc_init(bd_t *bis)
|
||||||
|
|
Loading…
Add table
Reference in a new issue