diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2018-02-27 01:56:06 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-08 22:47:41 -0800 |
| commit | 8421bd1de6af5a95cedbab53e9cf26bd0e999842 (patch) | |
| tree | cc9e34b6ed9a49447b5a8078b4b710a4394b9eee /include | |
| parent | 4f217494ee7a9442463fe971745c2839d9fd19f5 (diff) | |
| download | linux-stable-8421bd1de6af5a95cedbab53e9cf26bd0e999842.tar.gz linux-stable-8421bd1de6af5a95cedbab53e9cf26bd0e999842.tar.bz2 linux-stable-8421bd1de6af5a95cedbab53e9cf26bd0e999842.zip | |
net: phy: Restore phy_resume() locking assumption
[ Upstream commit 9c2c2e62df3fa30fb13fbeb7512a4eede729383b ]
commit f5e64032a799 ("net: phy: fix resume handling") changes the
locking semantics for phy_resume() such that the caller now needs to
hold the phy mutex. Not all call sites were adopted to this new
semantic, resulting in warnings from the added
WARN_ON(!mutex_is_locked(&phydev->lock)). Rather than change the
semantics, add a __phy_resume() and restore the old behavior of
phy_resume().
Reported-by: Heiner Kallweit <hkallweit1@gmail.com>
Fixes: f5e64032a799 ("net: phy: fix resume handling")
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/phy.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h index dc82a07cb4fd..123cd703741d 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -819,6 +819,7 @@ void phy_device_remove(struct phy_device *phydev); int phy_init_hw(struct phy_device *phydev); int phy_suspend(struct phy_device *phydev); int phy_resume(struct phy_device *phydev); +int __phy_resume(struct phy_device *phydev); int phy_loopback(struct phy_device *phydev, bool enable); struct phy_device *phy_attach(struct net_device *dev, const char *bus_id, phy_interface_t interface); |