net: phy: consolidate PHY reset in phy_init_hw()

[linux.git] / drivers / net / phy / phy.c

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 5d7101b3b604e5accc02671c2ec4c369af6d1635..e3dd69100da882a913ec754df29a5099b550ee2f 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -318,6 +318,7 @@ int phy_mii_ioctl(struct phy_device *phydev,
 {
        struct mii_ioctl_data *mii_data = if_mii(ifr);
        u16 val = mii_data->val_in;
+       int ret = 0;
 
        switch (cmd) {
        case SIOCGMIIPHY:
@@ -362,7 +363,7 @@ int phy_mii_ioctl(struct phy_device *phydev,
 
                if (mii_data->reg_num == MII_BMCR &&
                    val & BMCR_RESET)
-                       phy_init_hw(phydev);
+                       ret = phy_init_hw(phydev);
                break;
 
        case SIOCSHWTSTAMP:
@@ -374,7 +375,7 @@ int phy_mii_ioctl(struct phy_device *phydev,
                return -EOPNOTSUPP;
        }
 
-       return 0;
+       return ret;
 }
 EXPORT_SYMBOL(phy_mii_ioctl);