summaryrefslogtreecommitdiffstats
path: root/board/tqc
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2015-09-11 13:32:49 -0300
committerStefano Babic <sbabic@denx.de>2015-09-13 11:05:50 +0200
commit36f5a7f64d0ec0de9db467495005e97ff956a721 (patch)
treed111f5e308863d0f7178d7ed821729f14acc00a0 /board/tqc
parentcbb8f9676c17e7c1c0aa71552cf0e5700055c146 (diff)
downloadblackbird-obmc-uboot-36f5a7f64d0ec0de9db467495005e97ff956a721.tar.gz
blackbird-obmc-uboot-36f5a7f64d0ec0de9db467495005e97ff956a721.zip
tqma6_mba6: 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: Markus Niebel <Markus.Niebel@tq-group.com> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Diffstat (limited to 'board/tqc')
-rw-r--r--board/tqc/tqma6/tqma6_mba6.c20
1 files changed, 11 insertions, 9 deletions
diff --git a/board/tqc/tqma6/tqma6_mba6.c b/board/tqc/tqma6/tqma6_mba6.c
index 6f4cffd95e..e58b71402b 100644
--- a/board/tqc/tqma6/tqma6_mba6.c
+++ b/board/tqc/tqma6/tqma6_mba6.c
@@ -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)
OpenPOWER on IntegriCloud