Merge remote-tracking branch 'asoc/topic/pcm512x' into asoc-next

[sfrench/cifs-2.6.git] / drivers / net / phy / marvell.c

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 15cbcdba618a81363765a78217f4d875518386cc..4d02b27df0445e7c1ad6f0774e44a5b7013bb05e 100644 (file)
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -681,9 +681,11 @@ static int m88e1116r_config_init(struct phy_device *phydev)
        if (err < 0)
                return err;
 
-       err = m88e1121_config_aneg_rgmii_delays(phydev);
-       if (err < 0)
-               return err;
+       if (phy_interface_is_rgmii(phydev)) {
+               err = m88e1121_config_aneg_rgmii_delays(phydev);
+               if (err < 0)
+                       return err;
+       }
 
        err = genphy_soft_reset(phydev);
        if (err < 0)