| Message ID | 20200706004046.20842-2-andre.przywara@arm.com |
|---|---|
| State | Accepted |
| Commit | 2808cf6c60b5484296651e23066c4b36594f0240 |
| Headers | show |
| Series | net: sun8i-emac fixes and cleanups | expand |
diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c index e2b05ace8f..d6685e00dc 100644 --- a/drivers/net/sun8i_emac.c +++ b/drivers/net/sun8i_emac.c @@ -435,6 +435,7 @@ static int _sun8i_emac_eth_init(struct emac_eth_dev *priv, u8 *enetaddr) { u32 reg, v; int timeout = 100; + int ret; reg = readl((priv->mac_reg + EMAC_CTL1)); @@ -473,7 +474,9 @@ static int _sun8i_emac_eth_init(struct emac_eth_dev *priv, u8 *enetaddr) tx_descs_init(priv); /* PHY Start Up */ - phy_startup(priv->phydev); + ret = phy_startup(priv->phydev); + if (ret) + return ret; sun8i_adjust_link(priv, priv->phydev);
When phy_startup() returns with an error, because there is no link or the user interrupted the process, we shall stop the _start() routine and return with an error, instead of proceeding anyway. This fixes pointless operations when there is no Ethernet cable connected, for instance. Signed-off-by: Andre Przywara <andre.przywara at arm.com> --- drivers/net/sun8i_emac.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)