diff options
| author | Bruce Allan <bruce.w.allan@intel.com> | 2011-07-22 06:21:41 +0000 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2011-08-04 05:00:21 -0700 |
| commit | b9e06f70dc186f8353cc593f2b4609383b3be7a9 (patch) | |
| tree | ba35a9357e7060d45a1822c853c46c498bb381d7 /drivers/net/e1000e | |
| parent | 945a51517cc0bd9e461f2018624dfc1faef9ddee (diff) | |
| download | op-kernel-dev-b9e06f70dc186f8353cc593f2b4609383b3be7a9.zip op-kernel-dev-b9e06f70dc186f8353cc593f2b4609383b3be7a9.tar.gz | |
e1000e: remove unnecessary check for NULL pointer
The array shadow_ram is never NULL.
Signed-off-by: Bruce Allan <bruce.w.allan@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/e1000e')
| -rw-r--r-- | drivers/net/e1000e/ich8lan.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c index f7a75c1..4e36978 100644 --- a/drivers/net/e1000e/ich8lan.c +++ b/drivers/net/e1000e/ich8lan.c @@ -2137,8 +2137,7 @@ static s32 e1000_read_nvm_ich8lan(struct e1000_hw *hw, u16 offset, u16 words, ret_val = 0; for (i = 0; i < words; i++) { - if ((dev_spec->shadow_ram) && - (dev_spec->shadow_ram[offset+i].modified)) { + if (dev_spec->shadow_ram[offset+i].modified) { data[i] = dev_spec->shadow_ram[offset+i].value; } else { ret_val = e1000_read_flash_word_ich8lan(hw, |
