diff options
| author | Michal Simek <michal.simek@xilinx.com> | 2016-05-18 12:46:12 +0200 |
|---|---|---|
| committer | Michal Simek <michal.simek@xilinx.com> | 2016-05-24 13:17:59 +0200 |
| commit | b733c278d7adc48c71bd06faf359db3d9e385185 (patch) | |
| tree | ffac509445c1f6964c49fac2bad7773825a73f13 /drivers/net/phy/natsemi.c | |
| parent | ef5e821bd89aa059a20841e041221dadbf60aa7d (diff) | |
| download | blackbird-obmc-uboot-b733c278d7adc48c71bd06faf359db3d9e385185.tar.gz blackbird-obmc-uboot-b733c278d7adc48c71bd06faf359db3d9e385185.zip | |
net: phy: Handle phy_startup() error codes properly
Propagate error code from genphy_update_link() to phy startup().
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'drivers/net/phy/natsemi.c')
| -rw-r--r-- | drivers/net/phy/natsemi.c | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/drivers/net/phy/natsemi.c b/drivers/net/phy/natsemi.c index d2e4c3c487..1592e9b7b9 100644 --- a/drivers/net/phy/natsemi.c +++ b/drivers/net/phy/natsemi.c @@ -93,10 +93,13 @@ static int dp83865_parse_status(struct phy_device *phydev) static int dp83865_startup(struct phy_device *phydev) { - genphy_update_link(phydev); - dp83865_parse_status(phydev); + int ret; - return 0; + ret = genphy_update_link(phydev); + if (ret) + return ret; + + return dp83865_parse_status(phydev); } @@ -134,10 +137,13 @@ static int dp83848_parse_status(struct phy_device *phydev) static int dp83848_startup(struct phy_device *phydev) { - genphy_update_link(phydev); - dp83848_parse_status(phydev); + int ret; - return 0; + ret = genphy_update_link(phydev); + if (ret) + return ret; + + return dp83848_parse_status(phydev); } static struct phy_driver DP83848_driver = { |
