summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2015-09-11 00:53:51 -0300
committerStefano Babic <sbabic@denx.de>2015-09-13 11:05:15 +0200
commit747472bb960e37080e0f498f7cf752a89ad148c9 (patch)
tree9ee5ccaa44a3d182dc057db2cb37a676dcc6809e
parent8f6edf6d30cc22a4231c5dd97a3bd82803d8f08c (diff)
downloadu-boot-imx-747472bb960e37080e0f498f7cf752a89ad148c9.zip
u-boot-imx-747472bb960e37080e0f498f7cf752a89ad148c9.tar.gz
u-boot-imx-747472bb960e37080e0f498f7cf752a89ad148c9.tar.bz2
nitrogen6x: 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: Troy Kisky <troy.kisky@boundarydevices.com> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Troy Kisky <troy.kisky@boundarydevices.com>
-rw-r--r--board/boundary/nitrogen6x/nitrogen6x.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/board/boundary/nitrogen6x/nitrogen6x.c b/board/boundary/nitrogen6x/nitrogen6x.c
index d46b8db..104d71f 100644
--- a/board/boundary/nitrogen6x/nitrogen6x.c
+++ b/board/boundary/nitrogen6x/nitrogen6x.c
@@ -387,20 +387,17 @@ 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 at %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
#ifdef CONFIG_CI_UDC
@@ -408,6 +405,12 @@ int board_eth_init(bd_t *bis)
usb_eth_initialize(bis);
#endif
return 0;
+
+free_phydev:
+ free(phydev);
+free_bus:
+ free(bus);
+ return ret;
}
static void setup_buttons(void)