diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 6019e0aba23474869e2d6ca89e44385a21c11238..51e40a91db520fd98ebb96e5663fc081f91eec48 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -862,6 +862,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 phy_change()
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index a64a6240920deafc5f27ec0c9ab18b495b8b9adc..1117355313bc6656234e899f286c06a5f13bd959 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -825,8 +825,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);