Message ID | 20081209234346.GB7394@gambetta |
---|---|
State | Changes Requested, archived |
Delegated to: | David Miller |
Headers | show |
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c index 523b971..f971b83 100644 --- a/drivers/net/e1000e/ich8lan.c +++ b/drivers/net/e1000e/ich8lan.c @@ -1892,7 +1892,13 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw) */ ctrl |= E1000_CTRL_PHY_RST; } + ret_val = e1000_acquire_swflag_ich8lan(hw); + if (ret_val) { + hw_dbg(hw, "Failed to acquire NVM swflag"); + return ret_val; + } + hw_dbg(hw, "Issuing a global reset to ich8lan"); ew32(CTRL, (ctrl | E1000_CTRL_RST)); msleep(20);