|
|
@@ -1036,31 +1036,31 @@ int phy_init_eee(struct phy_device *phydev, bool clk_stop_enable)
|
|
|
/* First check if the EEE ability is supported */
|
|
|
eee_cap = phy_read_mmd_indirect(phydev, MDIO_PCS_EEE_ABLE,
|
|
|
MDIO_MMD_PCS, phydev->addr);
|
|
|
- if (eee_cap < 0)
|
|
|
- return eee_cap;
|
|
|
+ if (eee_cap <= 0)
|
|
|
+ goto eee_exit_err;
|
|
|
|
|
|
cap = mmd_eee_cap_to_ethtool_sup_t(eee_cap);
|
|
|
if (!cap)
|
|
|
- return -EPROTONOSUPPORT;
|
|
|
+ goto eee_exit_err;
|
|
|
|
|
|
/* Check which link settings negotiated and verify it in
|
|
|
* the EEE advertising registers.
|
|
|
*/
|
|
|
eee_lp = phy_read_mmd_indirect(phydev, MDIO_AN_EEE_LPABLE,
|
|
|
MDIO_MMD_AN, phydev->addr);
|
|
|
- if (eee_lp < 0)
|
|
|
- return eee_lp;
|
|
|
+ if (eee_lp <= 0)
|
|
|
+ goto eee_exit_err;
|
|
|
|
|
|
eee_adv = phy_read_mmd_indirect(phydev, MDIO_AN_EEE_ADV,
|
|
|
MDIO_MMD_AN, phydev->addr);
|
|
|
- if (eee_adv < 0)
|
|
|
- return eee_adv;
|
|
|
+ if (eee_adv <= 0)
|
|
|
+ goto eee_exit_err;
|
|
|
|
|
|
adv = mmd_eee_adv_to_ethtool_adv_t(eee_adv);
|
|
|
lp = mmd_eee_adv_to_ethtool_adv_t(eee_lp);
|
|
|
idx = phy_find_setting(phydev->speed, phydev->duplex);
|
|
|
if (!(lp & adv & settings[idx].setting))
|
|
|
- return -EPROTONOSUPPORT;
|
|
|
+ goto eee_exit_err;
|
|
|
|
|
|
if (clk_stop_enable) {
|
|
|
/* Configure the PHY to stop receiving xMII
|
|
|
@@ -1080,7 +1080,7 @@ int phy_init_eee(struct phy_device *phydev, bool clk_stop_enable)
|
|
|
|
|
|
return 0; /* EEE supported */
|
|
|
}
|
|
|
-
|
|
|
+eee_exit_err:
|
|
|
return -EPROTONOSUPPORT;
|
|
|
}
|
|
|
EXPORT_SYMBOL(phy_init_eee);
|