diff options
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/dwc_eth_xgmac.c | 2 | ||||
-rw-r--r-- | drivers/net/dwc_eth_xgmac_socfpga.c | 8 | ||||
-rw-r--r-- | drivers/net/fec_mxc.c | 1 | ||||
-rw-r--r-- | drivers/net/rswitch.c | 4 |
4 files changed, 8 insertions, 7 deletions
diff --git a/drivers/net/dwc_eth_xgmac.c b/drivers/net/dwc_eth_xgmac.c index 03959ea95a5..d29d871ea8c 100644 --- a/drivers/net/dwc_eth_xgmac.c +++ b/drivers/net/dwc_eth_xgmac.c @@ -1102,7 +1102,7 @@ static int xgmac_probe(struct udevice *dev) ret = xgmac->config->ops->xgmac_start_clks(dev); if (ret < 0) { pr_err("%s xgmac_start_clks() failed: %d\n", dev->name, ret); - return ret; + goto err_remove_resources_core; } if (IS_ENABLED(CONFIG_DM_ETH_PHY)) diff --git a/drivers/net/dwc_eth_xgmac_socfpga.c b/drivers/net/dwc_eth_xgmac_socfpga.c index c89c8a188b7..f72f16b50ab 100644 --- a/drivers/net/dwc_eth_xgmac_socfpga.c +++ b/drivers/net/dwc_eth_xgmac_socfpga.c @@ -39,11 +39,9 @@ phy_interface_t dwxgmac_of_get_mac_mode(struct udevice *dev) if (!mac_mode) return PHY_INTERFACE_MODE_NA; - if (mac_mode) { - for (i = 0; i < PHY_INTERFACE_MODE_MAX; i++) { - if (!strcmp(mac_mode, phy_interface_strings[i])) - return i; - } + for (i = 0; i < PHY_INTERFACE_MODE_MAX; i++) { + if (!strcmp(mac_mode, phy_interface_strings[i])) + return i; } return PHY_INTERFACE_MODE_NA; } diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 54b08482b91..9ac72d25ef6 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -1344,6 +1344,7 @@ static int fecmxc_probe(struct udevice *dev) while (readl(&priv->eth->ecntrl) & FEC_ECNTRL_RESET) { if (get_timer(start) > (CONFIG_SYS_HZ * 5)) { printf("FEC MXC: Timeout resetting chip\n"); + ret = -ETIMEDOUT; goto err_timeout; } udelay(10); diff --git a/drivers/net/rswitch.c b/drivers/net/rswitch.c index 62d3f39f071..f27587ac8bd 100644 --- a/drivers/net/rswitch.c +++ b/drivers/net/rswitch.c @@ -1110,8 +1110,10 @@ static int rswitch_probe(struct udevice *dev) return -EINVAL; priv->rsw_clk = devm_clk_get(dev, NULL); - if (ret) + if (IS_ERR(priv->rsw_clk)) { + ret = PTR_ERR(priv->rsw_clk); goto err_map; + } ret = clk_prepare_enable(priv->rsw_clk); if (ret) |