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

Cc: Markus Niebel <Markus.Niebel@tq-group.com>
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
board/tqc/tqma6/tqma6_mba6.c

index 6f4cffd95ecd3b3dbf1df181f9998f7936a5f570..e58b71402b5a26c85a3ae8dc05edf03b01a952c3 100644 (file)
@@ -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)