aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Rix <trix@redhat.com>2021-05-21 12:50:19 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-07-28 14:35:31 +0200
commit02d1af0bee65d8746f5630b648a8778ff57b5a70 (patch)
treebd91317256bf3255de4394ae4625d42f80557ccc
parentf153664d8e70c11d0371341613651e1130e20240 (diff)
downloadkernel_replicant_linux-02d1af0bee65d8746f5630b648a8778ff57b5a70.tar.gz
kernel_replicant_linux-02d1af0bee65d8746f5630b648a8778ff57b5a70.tar.bz2
kernel_replicant_linux-02d1af0bee65d8746f5630b648a8778ff57b5a70.zip
igc: change default return of igc_read_phy_reg()
[ Upstream commit 05682a0a61b6cbecd97a0f37f743b2cbfd516977 ] Static analysis reports this problem igc_main.c:4944:20: warning: The left operand of '&' is a garbage value if (!(phy_data & SR_1000T_REMOTE_RX_STATUS) && ~~~~~~~~ ^ phy_data is set by the call to igc_read_phy_reg() only if there is a read_reg() op, else it is unset and a 0 is returned. Change the return to -EOPNOTSUPP. Fixes: 208983f099d9 ("igc: Add watchdog") Signed-off-by: Tom Rix <trix@redhat.com> Tested-by: Dvora Fuxbrumer <dvorax.fuxbrumer@linux.intel.com> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/net/ethernet/intel/igc/igc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/igc/igc.h b/drivers/net/ethernet/intel/igc/igc.h
index 6dca67d9c25d..a97bf7a5f1d6 100644
--- a/drivers/net/ethernet/intel/igc/igc.h
+++ b/drivers/net/ethernet/intel/igc/igc.h
@@ -532,7 +532,7 @@ static inline s32 igc_read_phy_reg(struct igc_hw *hw, u32 offset, u16 *data)
if (hw->phy.ops.read_reg)
return hw->phy.ops.read_reg(hw, offset, data);
- return 0;
+ return -EOPNOTSUPP;
}
void igc_reinit_locked(struct igc_adapter *);