diff mbox series

igc: set the default return value to -IGC_ERR_NVM in igc_write_nvm_srwr

Message ID 20201211143456.GA83809@ns.kevlo.org (mailing list archive)
State Superseded
Delegated to: Netdev Maintainers
Headers show
Series igc: set the default return value to -IGC_ERR_NVM in igc_write_nvm_srwr | expand

Checks

Context Check Description
netdev/cover_letter success Link
netdev/fixes_present success Link
netdev/patch_count success Link
netdev/tree_selection success Guessed tree name to be net-next
netdev/subject_prefix warning Target tree name not specified in the subject
netdev/source_inline success Was 0 now: 0
netdev/verify_signedoff success Link
netdev/module_param success Was 0 now: 0
netdev/build_32bit success Errors and warnings before: 0 this patch: 0
netdev/kdoc success Errors and warnings before: 0 this patch: 0
netdev/verify_fixes success Link
netdev/checkpatch success total: 0 errors, 0 warnings, 0 checks, 15 lines checked
netdev/build_allmodconfig_warn success Errors and warnings before: 0 this patch: 0
netdev/header_inline success Link
netdev/stable success Stable not CCed

Commit Message

Kevin Lo Dec. 11, 2020, 2:34 p.m. UTC 
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.

Signed-off-by: Kevin Lo <kevlo@kevlo.org>
---

Comments

Jakub Kicinski Dec. 12, 2020, 10 p.m. UTC | #1 
On Fri, 11 Dec 2020 22:34:56 +0800 Kevin Lo wrote:
> 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.
> 
> Signed-off-by: Kevin Lo <kevlo@kevlo.org>

This is a fix, please add a Fixes tag.

Please CC the maintainers:

M:	Jesse Brandeburg <jesse.brandeburg@intel.com>
M:	Tony Nguyen <anthony.l.nguyen@intel.com>
Kevin Lo Dec. 14, 2020, 1:21 a.m. UTC | #2 
On Sat, Dec 12, 2020 at 02:00:10PM -0800, Jakub Kicinski wrote:
> 
> On Fri, 11 Dec 2020 22:34:56 +0800 Kevin Lo wrote:
> > 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.
> > 
> > Signed-off-by: Kevin Lo <kevlo@kevlo.org>
> 
> This is a fix, please add a Fixes tag.
> 
> Please CC the maintainers:
> 
> M:	Jesse Brandeburg <jesse.brandeburg@intel.com>
> M:	Tony Nguyen <anthony.l.nguyen@intel.com>

I will update the Fixes tag and send V2, thanks.
diff mbox series

Patch

diff --git a/drivers/net/ethernet/intel/igc/igc_i225.c b/drivers/net/ethernet/intel/igc/igc_i225.c
index 8b67d9b49a83..b0a5cd31683e 100644
--- a/drivers/net/ethernet/intel/igc/igc_i225.c
+++ b/drivers/net/ethernet/intel/igc/igc_i225.c
@@ -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;
 	}