| From fda2635466cd26ad237e1bc5d3f6a60f97ad09b6 Mon Sep 17 00:00:00 2001 |
| From: Corinna Vinschen <vinschen@redhat.com> |
| Date: Wed, 16 Feb 2022 14:31:35 +0100 |
| Subject: igc: igc_read_phy_reg_gpy: drop premature return |
| |
| From: Corinna Vinschen <vinschen@redhat.com> |
| |
| commit fda2635466cd26ad237e1bc5d3f6a60f97ad09b6 upstream. |
| |
| 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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| drivers/net/ethernet/intel/igc/igc_phy.c | 2 -- |
| 1 file changed, 2 deletions(-) |
| |
| --- a/drivers/net/ethernet/intel/igc/igc_phy.c |
| +++ b/drivers/net/ethernet/intel/igc/igc_phy.c |
| @@ -767,8 +767,6 @@ s32 igc_read_phy_reg_gpy(struct igc_hw * |
| 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, |
