summaryrefslogtreecommitdiffstats
path: root/drivers/net/phy
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2023-02-17 04:07:13 +0100
committerDavid S. Miller <davem@davemloft.net>2023-02-20 10:04:22 +0000
commit3365777a6a2243f1cca5a441f2c89002d16fc580 (patch)
treee2b663d44b92d86cdfbccb34d868c2c71762adbd /drivers/net/phy
parentcf06eef0c86bd2088bafecb211e06a2855b4c327 (diff)
downloadlinux-3365777a6a2243f1cca5a441f2c89002d16fc580.tar.gz
linux-3365777a6a2243f1cca5a441f2c89002d16fc580.tar.bz2
linux-3365777a6a2243f1cca5a441f2c89002d16fc580.zip
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: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
-rw-r--r--drivers/net/phy/marvell.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 0d706ee266af..63a3644d86c9 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -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;