diff options
| author | David S. Miller <davem@davemloft.net> | 2018-07-25 05:21:58 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-25 05:21:58 +0300 |
| commit | 19725496da5602b401eae389736ab00d1817e264 (patch) | |
| tree | 4c1a94bf0121769110f1b9c08ee337a55679a48a /drivers/net/phy/phy.c | |
| parent | aea5f654e6b78a0c976f7a25950155932c77a53f (diff) | |
| parent | 9981b4fb8684883dcc0daf088891ff32260b9794 (diff) | |
| download | linux-19725496da5602b401eae389736ab00d1817e264.tar.xz | |
Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/phy/phy.c')
| -rw-r--r-- | drivers/net/phy/phy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index d2baedc4ea91..914fe8e6ac86 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -519,7 +519,7 @@ static int phy_start_aneg_priv(struct phy_device *phydev, bool sync) * negotiation may already be done and aneg interrupt may not be * generated. */ - if (phy_interrupt_is_valid(phydev) && (phydev->state == PHY_AN)) { + if (phydev->irq != PHY_POLL && phydev->state == PHY_AN) { err = phy_aneg_done(phydev); if (err > 0) { trigger = true; |