]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
udoo: Fix the error handling in board_eth_init()
authorFabio Estevam <fabio.estevam@freescale.com>
Fri, 11 Sep 2015 16:32:50 +0000 (13:32 -0300)
committerStefano Babic <sbabic@denx.de>
Sun, 13 Sep 2015 09:06:08 +0000 (11:06 +0200)
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>
board/udoo/udoo.c

index a8bd90a42a81d6b26199533267585a746594ded5..a574a2fceca4036547c0deb5caaf31bf12ba6527 100644 (file)
@@ -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)