]> git.baikalelectronics.ru Git - kernel.git/commitdiff
igc: igc_write_phy_reg_gpy: drop premature return
authorSasha Neftin <sasha.neftin@intel.com>
Sun, 20 Feb 2022 07:29:15 +0000 (09:29 +0200)
committerTony Nguyen <anthony.l.nguyen@intel.com>
Mon, 28 Feb 2022 16:48:45 +0000 (08:48 -0800)
Similar to "igc_read_phy_reg_gpy: drop premature return" patch.
igc_write_phy_reg_gpy checks the return value from igc_write_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")
Suggested-by: Dima Ruinskiy <dima.ruinskiy@intel.com>
Reported-by: Corinna Vinschen <vinschen@redhat.com>
Signed-off-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 df91d07ce82a383d43200c5279739da46853b204..40dbf4b43234546634a3f8f04243fc651ea1f2e7 100644 (file)
@@ -746,8 +746,6 @@ s32 igc_write_phy_reg_gpy(struct igc_hw *hw, u32 offset, u16 data)
                if (ret_val)
                        return ret_val;
                ret_val = igc_write_phy_reg_mdic(hw, offset, data);
-               if (ret_val)
-                       return ret_val;
                hw->phy.ops.release(hw);
        } else {
                ret_val = igc_write_xmdio_reg(hw, (u16)offset, dev_addr,