From e172943ebf720c198331068a5f1439c987454fba Mon Sep 17 00:00:00 2001 From: Bruce Allan Date: Fri, 22 Jul 2011 06:21:41 +0000 Subject: [PATCH] --- yaml --- r: 262486 b: refs/heads/master c: b9e06f70dc186f8353cc593f2b4609383b3be7a9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000e/ich8lan.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index d9b2671e66eb..039928f25d61 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 945a51517cc0bd9e461f2018624dfc1faef9ddee +refs/heads/master: b9e06f70dc186f8353cc593f2b4609383b3be7a9 diff --git a/trunk/drivers/net/e1000e/ich8lan.c b/trunk/drivers/net/e1000e/ich8lan.c index f7a75c1531ad..4e36978b8fd8 100644 --- a/trunk/drivers/net/e1000e/ich8lan.c +++ b/trunk/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,