Also propagate errors. Requested by Marek as part of upstream review.
Signed-off-by: Ian Campbell <[email protected]> --- arch/arm/cpu/armv7/sunxi/board.c | 15 +++++++++++++-- drivers/net/sunxi_gmac.c | 6 ++---- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/arch/arm/cpu/armv7/sunxi/board.c b/arch/arm/cpu/armv7/sunxi/board.c index 34d7872..662ad4c 100644 --- a/arch/arm/cpu/armv7/sunxi/board.c +++ b/arch/arm/cpu/armv7/sunxi/board.c @@ -137,11 +137,22 @@ void enable_caches(void) */ int cpu_eth_init(bd_t *bis) { + int rc; + #ifdef CONFIG_SUNXI_EMAC - sunxi_emac_initialize(bis); + rc = sunxi_emac_initialize(bis); + if (rc < 0) { + printf("sunxi: failed to initiliaze emac\n"); + return rc; + } #endif + #ifdef CONFIG_SUNXI_GMAC - sunxi_gmac_initialize(bis); + rc = sunxi_gmac_initialize(bis); + if (rc < 0) { + printf("sunxi: failed to initialize gmac\n"); + return rc; + } #endif return 0; diff --git a/drivers/net/sunxi_gmac.c b/drivers/net/sunxi_gmac.c index d59f877..e7ff952 100644 --- a/drivers/net/sunxi_gmac.c +++ b/drivers/net/sunxi_gmac.c @@ -36,10 +36,8 @@ int sunxi_gmac_initialize(bd_t *bis) } #ifdef CONFIG_RGMII - designware_initialize(SUNXI_GMAC_BASE, PHY_INTERFACE_MODE_RGMII); + return designware_initialize(SUNXI_GMAC_BASE, PHY_INTERFACE_MODE_RGMII); #else - designware_initialize(SUNXI_GMAC_BASE, PHY_INTERFACE_MODE_MII); + return designware_initialize(SUNXI_GMAC_BASE, PHY_INTERFACE_MODE_MII); #endif - - return 0; } -- 1.9.0 -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
