diff options
| author | Tom Rini <trini@konsulko.com> | 2016-05-24 08:20:43 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-05-24 08:20:43 -0400 |
| commit | ec8fb48ce98987065493b27422200897cf0909f8 (patch) | |
| tree | e56d70ee24a04ee26fe75ac2af46c22705da61ed /drivers/net/phy/micrel.c | |
| parent | c98dc5a13399414fb651a80d05fa682236c4444e (diff) | |
| parent | ad5b5801264e573bfbf17a20b04c546985c5bfc1 (diff) | |
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'drivers/net/phy/micrel.c')
| -rw-r--r-- | drivers/net/phy/micrel.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 8fcf737cb8f..b08788a2b05 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -181,7 +181,12 @@ static struct phy_driver KS8721_driver = { static int ksz90xx_startup(struct phy_device *phydev) { unsigned phy_ctl; - genphy_update_link(phydev); + int ret; + + ret = genphy_update_link(phydev); + if (ret) + return ret; + phy_ctl = phy_read(phydev, MDIO_DEVAD_NONE, MII_KSZ90xx_PHY_CTL); if (phy_ctl & MIIM_KSZ90xx_PHYCTL_DUPLEX) |