diff options
author | David Ertman <david.m.ertman@intel.com> | 2014-07-09 12:07:42 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2014-07-25 23:51:00 -0400 |
commit | 491a04d2812b0a665bda34ea39875833dc7a1aaf (patch) | |
tree | dccfd1e8134272c43c712d10f7f83ebadce1b1de /drivers/net/ethernet/intel/e1000e/manage.c | |
parent | 493004d04f56fd7d642bdbb2938e17e5f7d622d1 (diff) |
e1000e: Add code to check return values on NVM accesses
Adding code to check and respond to previously ignored return values
from NVM access functions.
Issue discovered through static analysis.
Signed-off-by: Dave Ertman <david.m.ertman@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/manage.c')
-rw-r--r-- | drivers/net/ethernet/intel/e1000e/manage.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/manage.c b/drivers/net/ethernet/intel/e1000e/manage.c index cb37ff1f1321..58856032298d 100644 --- a/drivers/net/ethernet/intel/e1000e/manage.c +++ b/drivers/net/ethernet/intel/e1000e/manage.c | |||
@@ -327,9 +327,12 @@ bool e1000e_enable_mng_pass_thru(struct e1000_hw *hw) | |||
327 | } else if ((hw->mac.type == e1000_82574) || | 327 | } else if ((hw->mac.type == e1000_82574) || |
328 | (hw->mac.type == e1000_82583)) { | 328 | (hw->mac.type == e1000_82583)) { |
329 | u16 data; | 329 | u16 data; |
330 | s32 ret_val; | ||
330 | 331 | ||
331 | factps = er32(FACTPS); | 332 | factps = er32(FACTPS); |
332 | e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &data); | 333 | ret_val = e1000_read_nvm(hw, NVM_INIT_CONTROL2_REG, 1, &data); |
334 | if (ret_val) | ||
335 | return false; | ||
333 | 336 | ||
334 | if (!(factps & E1000_FACTPS_MNGCG) && | 337 | if (!(factps & E1000_FACTPS_MNGCG) && |
335 | ((data & E1000_NVM_INIT_CTRL2_MNGM) == | 338 | ((data & E1000_NVM_INIT_CTRL2_MNGM) == |