diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2021-02-02 14:21:31 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2021-02-02 14:21:31 -0800 |
| commit | d1e1355aefcc0cbda750a8931e93e1e04a5b0b6a (patch) | |
| tree | f43b81751cb5c5736268057ecdbcdb99dd00e826 /drivers/net/ethernet/intel/igc/igc_i225.c | |
| parent | 9ae4bdc6e4c1281ddf8d6335bea35864d086cbf9 (diff) | |
| parent | 3aaf0a27ffc29b19a62314edd684b9bc6346f9a8 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/intel/igc/igc_i225.c')
| -rw-r--r-- | drivers/net/ethernet/intel/igc/igc_i225.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/igc/igc_i225.c b/drivers/net/ethernet/intel/igc/igc_i225.c index 8b67d9b49a83..7ec04e48860c 100644 --- a/drivers/net/ethernet/intel/igc/igc_i225.c +++ b/drivers/net/ethernet/intel/igc/igc_i225.c @@ -219,9 +219,9 @@ static s32 igc_write_nvm_srwr(struct igc_hw *hw, u16 offset, u16 words, u16 *data) { struct igc_nvm_info *nvm = &hw->nvm; + s32 ret_val = -IGC_ERR_NVM; u32 attempts = 100000; u32 i, k, eewr = 0; - s32 ret_val = 0; /* A check for invalid values: offset too large, too many words, * too many words for the offset, and not enough words. @@ -229,7 +229,6 @@ 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"); - ret_val = -IGC_ERR_NVM; goto out; } |