| Message ID | 20220220072915.3067085-1-sasha.neftin@intel.com |
|---|---|
| State | Accepted |
| Delegated to: | Anthony Nguyen |
| Headers | show |
| Series | [v1,1/1] igc: igc_write_phy_reg_gpy: drop premature return | expand |
On 2/20/2022 09:29, Sasha Neftin wrote: > 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> > --- > drivers/net/ethernet/intel/igc/igc_phy.c | 2 -- > 1 file changed, 2 deletions(-) Tested-by: Naama Meir <naamax.meir@linux.intel.com>
diff --git a/drivers/net/ethernet/intel/igc/igc_phy.c b/drivers/net/ethernet/intel/igc/igc_phy.c index df91d07ce82a..40dbf4b43234 100644 --- a/drivers/net/ethernet/intel/igc/igc_phy.c +++ b/drivers/net/ethernet/intel/igc/igc_phy.c @@ -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,
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> --- drivers/net/ethernet/intel/igc/igc_phy.c | 2 -- 1 file changed, 2 deletions(-)