| From ef6841dc5c7c8d3bbfd8b6c8c901d664fed8635e Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 21 May 2021 12:50:19 -0700 |
| Subject: igc: change default return of igc_read_phy_reg() |
| |
| From: Tom Rix <trix@redhat.com> |
| |
| [ 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> |
| --- |
| drivers/net/ethernet/intel/igc/igc.h | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/net/ethernet/intel/igc/igc.h b/drivers/net/ethernet/intel/igc/igc.h |
| index 25871351730b..58e842cbf6ef 100644 |
| --- a/drivers/net/ethernet/intel/igc/igc.h |
| +++ b/drivers/net/ethernet/intel/igc/igc.h |
| @@ -560,7 +560,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 *); |
| -- |
| 2.30.2 |
| |
