projects
/
firefly-linux-kernel-4.4.55.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
945a515
)
e1000e: remove unnecessary check for NULL pointer
author
Bruce Allan
<bruce.w.allan@intel.com>
Fri, 22 Jul 2011 06:21:41 +0000
(06:21 +0000)
committer
Jeff Kirsher
<jeffrey.t.kirsher@intel.com>
Thu, 4 Aug 2011 12:00:21 +0000
(
05:00
-0700)
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>
drivers/net/e1000e/ich8lan.c
patch
|
blob
|
history
diff --git
a/drivers/net/e1000e/ich8lan.c
b/drivers/net/e1000e/ich8lan.c
index f7a75c1531ad21d175aa49b2381ad990008b97df..4e36978b8fd8f11c2042d611165a28b119111ad1 100644
(file)
--- 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,