net: phy: don't reschedule state machine when PHY is halted

When being in state PHY_HALTED we don't have to reschedule the
state machine, phy_start() will start it again.

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index a5e0f072103571d03f3219f3f677f4cde6ac01ee..a1f8e4816f7271807d98eb92e76aa6ec370072a4 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -1123,9 +1123,13 @@ void phy_state_machine(struct work_struct *work)
 
        /* Only re-schedule a PHY state machine change if we are polling the
         * PHY, if PHY_IGNORE_INTERRUPT is set, then we will be moving
-        * between states from phy_mac_interrupt()
+        * between states from phy_mac_interrupt().
+        *
+        * In state PHY_HALTED the PHY gets suspended, so rescheduling the
+        * state machine would be pointless and possibly error prone when
+        * called from phy_disconnect() synchronously.
         */
-       if (phy_polling_mode(phydev))
+       if (phy_polling_mode(phydev) && old_state != PHY_HALTED)
                queue_delayed_work(system_power_efficient_wq, &phydev->state_queue,
                                   PHY_STATE_TIME * HZ);
 }