Commit 3365777a authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

net: phy: marvell: Use the unlocked genphy_c45_ethtool_get_eee() 



phy_ethtool_get_eee() is about to gain locking of the phydev lock.
This means it cannot be used within a PHY driver without causing a
deadlock. Swap to using genphy_c45_ethtool_get_eee() which assumes the
lock has already been taken.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cf06eef0

drivers/net/phy/marvell.c

+1 −1
Original line number Diff line number Diff line
@@ -1467,7 +1467,7 @@ static int m88e1540_set_fld(struct phy_device *phydev, const u8 *msecs) 
	/* According to the Marvell data sheet EEE must be disabled for

	 * Fast Link Down detection to work properly

	 */

	ret = phy_ethtool_get_eee(phydev, &eee);

	ret = genphy_c45_ethtool_get_eee(phydev, &eee);

	if (!ret && eee.eee_enabled) {

		phydev_warn(phydev, "Fast Link Down detection requires EEE to be disabled!\n");

		return -EBUSY;