Skip to contentSkip to conversation

cavium/liquidio: fix some error handling in lio_set_phys_id()

PATCH Applied Dan Carpenter 2 participants 2 messages Jun 24, 2015 – Jun 25, 2015

Subsystems (4)
Networking Network drivers Kernel janitors Cavium liquidio network driver
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 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 <[email protected]>
drivers/net/ethernet/cavium/liquidio/lio_ethtool.c +3 -2
index 160f807..29f3308 100644
@@ -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;
maintainer Applied
#1 lore raw

From: Dan Carpenter <[email protected]>
Date: Wed, 24 Jun 2015 17:47:02 +0300

Quoted 5 lines

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 <[email protected]>

Applied.