From 2394fb9cab48c96633a354ec053af58c7eeda86e Mon Sep 17 00:00:00 2001 From: Bruce Allan Date: Fri, 16 Dec 2011 00:46:49 +0000 Subject: [PATCH] --- yaml --- r: 289771 b: refs/heads/master c: 464c85e37e6b2d2ad4f3bea23a59408c5595db15 h: refs/heads/master i: 289769: 2e21055ab3cbef89f88eaf8aa672be842917d046 289767: bcf6a9fd94729e6b1de23a1d1e3eb8061c6eeaa8 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d8416bf43ff1..aba5d3086f45 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7f1557e1422a4cc842af641c6716714751c06865 +refs/heads/master: 464c85e37e6b2d2ad4f3bea23a59408c5595db15 diff --git a/trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c b/trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c index d99548ce4da7..6a6e6f6d9e73 100644 --- a/trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c +++ b/trunk/drivers/net/ethernet/intel/e1000e/ich8lan.c @@ -1921,7 +1921,9 @@ static s32 e1000_set_lplu_state_pchlan(struct e1000_hw *hw, bool active) else oem_reg &= ~HV_OEM_BITS_LPLU; - oem_reg |= HV_OEM_BITS_RESTART_AN; + if (!e1000_check_reset_block(hw)) + oem_reg |= HV_OEM_BITS_RESTART_AN; + ret_val = e1e_wphy(hw, HV_OEM_BITS, oem_reg); out: