From: Nathan Sullivan <nathan.sulli...@ni.com>
3.12-stable review patch. If anyone has any objections, please let me know.
===============
[ Upstream commit 49d52e8108a21749dc2114b924c907db43358984 ]
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: 00db8189d984 ("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.sulli...@ni.com>
Signed-off-by: Brad Mouring <brad.mour...@ni.com>
Acked-by: Xander Huff <xander.h...@ni.com>
Acked-by: Kyle Roeschley <kyle.roesch...@ni.com>
Reviewed-by: Florian Fainelli <f.faine...@gmail.com>
Signed-off-by: David S. Miller <da...@davemloft.net>
---
drivers/net/phy/phy.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 0bc73f2c24ba..eca07101dc0c 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -473,7 +473,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);
--
2.12.2
