diff options
| author |   Andrew Lunn <andrew@lunn.ch> | 2019-01-11 00:15:21 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-01-15 21:51:19 -0800 |
| commit | e0a7328fad9979104f73e19bedca821ef3262ae1 (patch) | |
| tree | cda417e2b65abbba239f6911f0ade3ac0ec2b70d | |
| parent | net: phy: marvell: Errata for mv88e6390 internal PHYs (diff) | |
| download | linux-dev-e0a7328fad9979104f73e19bedca821ef3262ae1.tar.xz linux-dev-e0a7328fad9979104f73e19bedca821ef3262ae1.zip | |
net: phy: marvell: Fix deadlock from wrong locking
m88e1318_set_wol() takes the lock as part of phy_select_page(). Don't
take the lock again with phy_read(), use the unlocked __phy_read().
Fixes: 424ca4c55121 ("net: phy: marvell: fix paged access races")
Reported-by: Åke Rehnman <ake.rehnman@gmail.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/phy/marvell.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index 0d6b58d1cdc0..2e12f982534f 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -1435,7 +1435,7 @@ static int m88e1318_set_wol(struct phy_device *phydev, * before enabling it if !phy_interrupt_is_valid() */ if (!phy_interrupt_is_valid(phydev)) - phy_read(phydev, MII_M1011_IEVENT); + __phy_read(phydev, MII_M1011_IEVENT); /* Enable the WOL interrupt */ err = __phy_modify(phydev, MII_88E1318S_PHY_CSIER, 0, |