net: phy: ensure phylib state machine is stopped after calling phy_stop (cbfd12b3) · Commits · 戴 / test

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>

drivers/net/phy/phy.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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

drivers/net/phy/phy_device.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -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);

Admin message