---

yaml --- r: 289771 b: refs/heads/master c: 464c85e h: refs/heads/master i: 289769: 2e21055 289767: bcf6a9f v: v3
git-mirror · Jan 27, 2012 · 2394fb9 · 2394fb9
1 parent eb19cbc
commit 2394fb9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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: