Commit 49d52e81 authored Mar 22, 2017 by Nathan Sullivan Committed by David S. Miller Mar 24, 2017

net: phy: handle state correctly in phy_stop_machine

If the PHY is halted on stop, then do not set the state to PHY_UP. This
ensures the phy will be restarted later in phy_start when the machine is
started again.

Fixes: 00db8189 ("This patch adds a PHY Abstraction Layer to the Linux Kernel, enabling ethernet drivers to remain as ignorant as is reasonable of the connected PHY's design and operation details.")
Signed-off-by: Nathan Sullivan <nathan.sullivan@ni.com>
Signed-off-by: Brad Mouring <brad.mouring@ni.com>
Acked-by: Xander Huff <xander.huff@ni.com>
Acked-by: Kyle Roeschley <kyle.roeschley@ni.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 48481c8f

drivers/net/phy/phy.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -681,7 +681,7 @@ void phy_stop_machine(struct phy_device *phydev)
		cancel_delayed_work_sync(&phydev->state_queue);

		mutex_lock(&phydev->lock);
		if (phydev->state > PHY_UP)
		if (phydev->state > PHY_UP && phydev->state != PHY_HALTED)
		phydev->state = PHY_UP;
		mutex_unlock(&phydev->lock);
		}