summaryrefslogtreecommitdiffstats
path: root/drivers/net/phy/phy_device.c
diff options
context:
space:
mode:
authorHeiner Kallweit2019-01-17 20:08:39 +0100
committerDavid S. Miller2019-01-18 23:12:25 +0100
commitcbfd12b3e8c3542e8142aa041714ed614d3f67b0 (patch)
tree36ae59a5707738b23beadf3d4f19b351ade7ef33 /drivers/net/phy/phy_device.c
parentnet: phy: stop PHY if needed when entering phy_disconnect (diff)
downloadkernel-qcow2-linux-cbfd12b3e8c3542e8142aa041714ed614d3f67b0.tar.gz
kernel-qcow2-linux-cbfd12b3e8c3542e8142aa041714ed614d3f67b0.tar.xz
kernel-qcow2-linux-cbfd12b3e8c3542e8142aa041714ed614d3f67b0.zip
net: phy: ensure phylib state machine is stopped after calling phy_stop
The call to the phylib state machine in phy_stop() just ensures that the state machine isn't re-triggered, but a state machine call may be scheduled already. So lets's call phy_stop_machine(). This also allows to get rid of the call to phy_stop_machine() in phy_disconnect(). Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy/phy_device.c')
-rw-r--r--drivers/net/phy/phy_device.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 616a5fe47f56..e269a355012d 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -1005,8 +1005,6 @@ void phy_disconnect(struct phy_device *phydev)
if (phydev->irq > 0)
phy_stop_interrupts(phydev);
- phy_stop_machine(phydev);
-
phydev->adjust_link = NULL;
phy_detach(phydev);