diff options
| author | Tom Rini <trini@konsulko.com> | 2016-05-24 12:20:43 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2016-05-24 12:20:43 (GMT) |
| commit | ec8fb48ce98987065493b27422200897cf0909f8 (patch) | |
| tree | e56d70ee24a04ee26fe75ac2af46c22705da61ed /drivers/net/zynq_gem.c | |
| parent | c98dc5a13399414fb651a80d05fa682236c4444e (diff) | |
| parent | ad5b5801264e573bfbf17a20b04c546985c5bfc1 (diff) | |
| download | u-boot-ec8fb48ce98987065493b27422200897cf0909f8.tar.xz | |
Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze
Diffstat (limited to 'drivers/net/zynq_gem.c')
| -rw-r--r-- | drivers/net/zynq_gem.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index aec8077..4d9c296 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -352,14 +352,14 @@ static int zynq_phy_init(struct udevice *dev) priv->phydev->supported = supported | ADVERTISED_Pause | ADVERTISED_Asym_Pause; priv->phydev->advertising = priv->phydev->supported; - phy_config(priv->phydev); - return 0; + return phy_config(priv->phydev); } static int zynq_gem_init(struct udevice *dev) { u32 i, nwconfig; + int ret; unsigned long clk_rate = 0; struct zynq_gem_priv *priv = dev_get_priv(dev); struct zynq_gem_regs *regs = priv->iobase; @@ -427,7 +427,9 @@ static int zynq_gem_init(struct udevice *dev) priv->init++; } - phy_startup(priv->phydev); + ret = phy_startup(priv->phydev); + if (ret) + return ret; if (!priv->phydev->link) { printf("%s: No link.\n", priv->phydev->dev->name); |