diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2016-05-18 14:37:23 +0200 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2016-05-24 13:17:59 +0200 |
| commit | 7a673f0b0642fc542b464a91957bdd44179296b2 (patch) | |
| tree | 237bee7f6b8986ca7ecfb3327e720a27eb5ee9e0 /drivers/net | |
| parent | 62afc601883e788f3f22291202d5b2a23c1a8b06 (diff) | |
| download | blackbird-obmc-uboot-7a673f0b0642fc542b464a91957bdd44179296b2.tar.gz blackbird-obmc-uboot-7a673f0b0642fc542b464a91957bdd44179296b2.zip | |
phy: Wire return value from phy_config()
Fix zynq_gem driver to handle error from phy_config correctly.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/phy/phy.c | 4 | ||||
| -rw-r--r-- | drivers/net/zynq_gem.c | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 98986bb6f1..4b6c09f88e 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -879,9 +879,7 @@ __weak int board_phy_config(struct phy_device *phydev) int phy_config(struct phy_device *phydev) { /* Invoke an optional board-specific helper */ - board_phy_config(phydev); - - return 0; + return board_phy_config(phydev); } int phy_shutdown(struct phy_device *phydev) diff --git a/drivers/net/zynq_gem.c b/drivers/net/zynq_gem.c index 3704ce0dd7..4d9c296c0b 100644 --- a/drivers/net/zynq_gem.c +++ b/drivers/net/zynq_gem.c @@ -352,9 +352,8 @@ 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) |
