2 files changed, 1 insertions, 2 deletions

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index b0632e859564..37cf39fdcc91 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -858,6 +858,7 @@ void phy_stop(struct phy_device *phydev)
         mutex_unlock(&phydev->lock);
 
         phy_state_machine(&phydev->state_queue.work);
+        phy_stop_machine(phydev);
 
         /* Cannot call flush_scheduled_work() here as desired because
          * of rtnl_lock(), but PHY_HALTED shall guarantee irq handler
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);