Commit b3d4f405 authored by Sasha Neftin's avatar Sasha Neftin Committed by Tony Nguyen
Browse files

igc: Fix overwrites return value 



drivers/net/ethernet/intel/igc/igc_i225.c:235 igc_write_nvm_srwr()
warn: loop overwrites return value 'ret_val'

Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarSasha Neftin <sasha.neftin@intel.com>
Tested-by: default avatarDvora Fuxbrumer <dvorax.fuxbrumer@linux.intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 87938851

drivers/net/ethernet/intel/igc/igc_i225.c

+2 −2
Original line number Diff line number Diff line
@@ -229,10 +229,11 @@ static s32 igc_write_nvm_srwr(struct igc_hw *hw, u16 offset, u16 words, 
	if (offset >= nvm->word_size || (words > (nvm->word_size - offset)) ||

	    words == 0) {

		hw_dbg("nvm parameter(s) out of bounds\n");

		goto out;

		return ret_val;

	}



	for (i = 0; i < words; i++) {

		ret_val = -IGC_ERR_NVM;

		eewr = ((offset + i) << IGC_NVM_RW_ADDR_SHIFT) |

			(data[i] << IGC_NVM_RW_REG_DATA) |

			IGC_NVM_RW_REG_START;
@@ -254,7 +255,6 @@ static s32 igc_write_nvm_srwr(struct igc_hw *hw, u16 offset, u16 words, 
		}

	}



out:

	return ret_val;

}