diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2015-06-24 17:47:02 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-06-25 02:13:03 -0700 |
commit | cbdb97773e906c5c4cafa51816436cdc35b1d1c8 (patch) | |
tree | b821596d99a36f47f7368147863e1795dd9d8d6d /drivers/net/ethernet/cavium/liquidio | |
parent | 5102e237912adf5c826cc7421fe25da66d293e94 (diff) | |
download | blackbird-op-linux-cbdb97773e906c5c4cafa51816436cdc35b1d1c8.tar.gz blackbird-op-linux-cbdb97773e906c5c4cafa51816436cdc35b1d1c8.zip |
cavium/liquidio: fix some error handling in lio_set_phys_id()
There was a missing assignment so the "if (ret)" on the next line is
never true.
Fixes: f21fb3ed364b ('Add support of Cavium Liquidio ethernet adapters')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/cavium/liquidio')
-rw-r--r-- | drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c b/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c index 160f8077692c..29f330831784 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c @@ -434,8 +434,9 @@ static int lio_set_phys_id(struct net_device *netdev, if (ret) return ret; - octnet_mdio45_access(lio, 1, LIO68XX_LED_BEACON_ADDR, - &lio->phy_beacon_val); + ret = octnet_mdio45_access(lio, 1, + LIO68XX_LED_BEACON_ADDR, + &lio->phy_beacon_val); if (ret) return ret; |