]> git.baikalelectronics.ru Git - kernel.git/commitdiff
igc: igc_read_phy_reg_gpy: drop premature return
authorCorinna Vinschen <vinschen@redhat.com>
Wed, 16 Feb 2022 13:31:35 +0000 (14:31 +0100)
committerTony Nguyen <anthony.l.nguyen@intel.com>
Mon, 28 Feb 2022 16:48:45 +0000 (08:48 -0800)
igc_read_phy_reg_gpy checks the return value from igc_read_phy_reg_mdic
and if it's not 0, returns immediately. By doing this, it leaves the HW
semaphore in the acquired state.

Drop this premature return statement, the function returns after
releasing the semaphore immediately anyway.

Fixes: 5586838fe9ce ("igc: Add code for PHY support")
Signed-off-by: Corinna Vinschen <vinschen@redhat.com>
Acked-by: Sasha Neftin <sasha.neftin@intel.com>
Tested-by: Naama Meir <naamax.meir@linux.intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
drivers/net/ethernet/intel/igc/igc_phy.c

index 5cad31c3c7b09454da34129ddf51a51808c0e389..df91d07ce82a383d43200c5279739da46853b204 100644 (file)
@@ -779,8 +779,6 @@ s32 igc_read_phy_reg_gpy(struct igc_hw *hw, u32 offset, u16 *data)
                if (ret_val)
                        return ret_val;
                ret_val = igc_read_phy_reg_mdic(hw, offset, data);
-               if (ret_val)
-                       return ret_val;
                hw->phy.ops.release(hw);
        } else {
                ret_val = igc_read_xmdio_reg(hw, (u16)offset, dev_addr,