ixgbe: fix incorrect status check
Subsystems (2)
PATCH v2 1/1 ixgbe: fix incorrect status check
Check for ret_val instead of !ret_val to allow the rest of the code to execute and configure the speed properly.
v2 - fixed few more cases in ixgbe_setup_mac_link_sfp_n()
Signed-off-by Emil Tantilov <[email protected]>
--- drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +4 -4
@@ -1750,14 +1750,14 @@ static s32 ixgbe_setup_sfi_x550a(struct ixgbe_hw *hw, ixgbe_link_speed *speed)if (ret_val ==IXGBE_ERR_SFP_NOT_PRESENT )return 0 ; -if (!ret_val) +if (ret_val)return ret_val;/* Configure internal PHY for native SFI based on module type */ ret_val = hw->mac.ops.read_iosf_sb_reg (hw,IXGBE_KRM_PMD_FLX_MASK_ST20 (hw->bus.lan_id),IXGBE_SB_IOSF_TARGET_KR_PHY , ®_phy_int); -if (!ret_val) +if (ret_val)return ret_val; reg_phy_int &=IXGBE_KRM_PMD_FLX_MASK_ST20_SFI_10G_DA ;
@@ -1767,7 +1767,7 @@ static s32 ixgbe_setup_sfi_x550a(struct ixgbe_hw *hw, ixgbe_link_speed *speed) ret_val = hw->mac.ops.write_iosf_sb_reg (hw,IXGBE_KRM_PMD_FLX_MASK_ST20 (hw->bus.lan_id),IXGBE_SB_IOSF_TARGET_KR_PHY , reg_phy_int); -if (!ret_val) +if (ret_val)return ret_val;/* Setup SFI internal link. */
@@ -1798,7 +1798,7 @@ static s32 ixgbe_setup_sfi_x550a(struct ixgbe_hw *hw, ixgbe_link_speed *speed)if (ret_val ==IXGBE_ERR_SFP_NOT_PRESENT )return 0 ; -if (!ret_val) +if (ret_val)return ret_val;/* Configure internal PHY for KR/KX. */
Singh
PATCH v2 1/1 ixgbe: fix incorrect status check
Quoted 8 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Emil Tantilov
Sent: Thursday, May 18, 2017 4:45 PM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH v2] ixgbe: fix incorrect status check
Quoted 7 lines
Check for
ret_valinstead of !ret_val to allow the rest of the code to execute and configure the speed properly.v2 - fixed few more cases in
ixgbe_setup_mac_link_sfp_n()Signed-off-by Emil Tantilov <[email protected]>---
Tested-by Krishneil Singh <[email protected]>