From: Shaohui Xie Date: Tue, 10 May 2016 09:42:26 +0000 (+0800) Subject: net: phylib: fix interrupts re-enablement in phy_start X-Git-Tag: v5.15~13696^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=84a527a41f38a80353f185d05e41b021e1ff672b;p=platform%2Fkernel%2Flinux-starfive.git net: phylib: fix interrupts re-enablement in phy_start If phy was suspended and is starting, current driver always enable phy's interrupts, if phy works in polling, phy can raise unexpected interrupt which will not be handled, the interrupt will block system enter suspend again. So interrupts should only be re-enabled if phy works in interrupt. Signed-off-by: Shaohui Xie Reviewed-by: Florian Fainelli Signed-off-by: David S. Miller --- diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 5590b9c..445fc5a 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -790,9 +790,11 @@ void phy_start(struct phy_device *phydev) break; case PHY_HALTED: /* make sure interrupts are re-enabled for the PHY */ - err = phy_enable_interrupts(phydev); - if (err < 0) - break; + if (phydev->irq != PHY_POLL) { + err = phy_enable_interrupts(phydev); + if (err < 0) + break; + } phydev->state = PHY_RESUMING; do_resume = true;