diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2015-09-11 13:32:50 -0300 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-09-13 11:06:08 +0200 |
| commit | 84c311f28e39d7b5b13069ae29a55bdf6c7c0890 (patch) | |
| tree | 76e8e50907fccc9e6c6aea7dbfb7ffea79496dca /board | |
| parent | 36f5a7f64d0ec0de9db467495005e97ff956a721 (diff) | |
| download | u-boot-imx-84c311f28e39d7b5b13069ae29a55bdf6c7c0890.zip u-boot-imx-84c311f28e39d7b5b13069ae29a55bdf6c7c0890.tar.gz u-boot-imx-84c311f28e39d7b5b13069ae29a55bdf6c7c0890.tar.bz2 | |
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>
Diffstat (limited to 'board')
| -rw-r--r-- | board/udoo/udoo.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/board/udoo/udoo.c b/board/udoo/udoo.c index a8bd90a..a574a2f 100644 --- a/board/udoo/udoo.c +++ b/board/udoo/udoo.c @@ -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 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 return 0; + +free_phydev: + free(phydev); +free_bus: + free(bus); + return ret; } int board_mmc_init(bd_t *bis) |