diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-11-06 16:10:44 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-11-06 16:10:44 +0100 |
| commit | 6aed170ef1ce8004972dc28e98204cd148d28631 (patch) | |
| tree | 0914012010c17be3560d3b0bd16ef5d81fc33015 /drivers | |
| parent | b5c7b09c8a4c089c644fd713924e733a1eebff69 (diff) | |
| parent | 9956226fbbc6fda84dcd5298723ad4827b037c58 (diff) | |
| download | barebox-6aed170ef1ce8004972dc28e98204cd148d28631.tar.gz barebox-6aed170ef1ce8004972dc28e98204cd148d28631.tar.xz | |
Merge branch 'for-next/net'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/phy/phy.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 2b3c5e2e02..25c999c550 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -502,13 +502,16 @@ int phy_wait_aneg_done(struct phy_device *phydev) return 0; while (!is_timeout(start, PHY_AN_TIMEOUT * SECOND)) { - if (phy_aneg_done(phydev) > 0) { - phydev->link = 1; - return 0; - } + if (phy_aneg_done(phydev) > 0) + break; } - phydev->link = 0; + do { + genphy_update_link(phydev); + if (phydev->link == 1) + return 0; + } while (!is_timeout(start, PHY_AN_TIMEOUT * SECOND)); + return -ETIMEDOUT; } |