Commit 8da77df6 authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by David S. Miller
Browse files

net: phy: always call phy_process_state_change() under lock 



phy_stop() calls phy_process_state_change() while holding the phydev
lock, so also arrange for phy_state_machine() to do the same, so that
this function is called with consistent locking.

Tested-by: default avatarJijie Shao <shaojijie@huawei.com>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 002841be

drivers/net/phy/phy.c

+1 −1
Original line number Diff line number Diff line
@@ -1506,6 +1506,7 @@ void phy_state_machine(struct work_struct *work) 
	if (err < 0)

		phy_error_precise(phydev, func, err);



	mutex_lock(&phydev->lock);

	phy_process_state_change(phydev, old_state);



	/* Only re-schedule a PHY state machine change if we are polling the
@@ -1516,7 +1517,6 @@ void phy_state_machine(struct work_struct *work) 
	 * state machine would be pointless and possibly error prone when

	 * called from phy_disconnect() synchronously.

	 */

	mutex_lock(&phydev->lock);

	if (phy_polling_mode(phydev) && phy_is_started(phydev))

		phy_queue_state_machine(phydev, PHY_STATE_TIME);

	mutex_unlock(&phydev->lock);