Message ID | e0ed2abfd1418cf3d933a73d2260b4f2d9fccaef.1495019090.git.joseph.salisbury@canonical.com |
---|---|
State | New |
Headers | show |
clean cherry-pick and in zesty already (so should be in hwe-edge, too).
Applied to yakkety master-next branch. Thanks. Cascardo.
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index c2dcf02..5960690 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -1194,7 +1194,8 @@ static int marvell_read_status(struct phy_device *phydev) int err; /* Check the fiber mode first */ - if (phydev->supported & SUPPORTED_FIBRE) { + if (phydev->supported & SUPPORTED_FIBRE && + phydev->interface != PHY_INTERFACE_MODE_SGMII) { err = phy_write(phydev, MII_MARVELL_PHY_PAGE, MII_M1111_FIBER); if (err < 0) goto error;