igc: set the default return value to -IGC_ERR_NVM in igc_write_nvm_srwr
Subsystems (2)
PATCH v2 1/1 igc: set the default return value to -IGC_ERR_NVM in igc_write_nvm_srwr
This patch sets the default return value to -IGC_ERR_NVM in igc_write_nvm_srwr. Without this change it wouldn't lead to a shadow RAM write EEWR timeout.
Fixes ab4056126813 ("igc: Add NVM support")
Signed-off-by Kevin Lo <[email protected]>
---
v2: Add a Fixes tag.
---
drivers/net/ethernet/intel/igc/igc_i225.c +1 -2
@@ -221,7 +221,7 @@ static s32 igc_write_nvm_srwr(struct igc_hw *hw, u16 offset, u16 words,struct igc_nvm_info *nvm = &hw->nvm;u32 attempts =100000 ;u32 i, k, eewr =0 ; -s32 ret_val =0 ; +s32 ret_val = -IGC_ERR_NVM ;/* 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; }