---

yaml --- r: 167932 b: refs/heads/master c: 74eee2e h: refs/heads/master v: v3
git-mirror · Oct 23, 2009 · 9cb1cbb · 9cb1cbb
1 parent 4a7352e
commit 9cb1cbb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2bd9af046fdc10703b266b0f3b25423f0b7d703e
+refs/heads/master: 74eee2e8d08048c847d1998c686e12a477ff939a
diff --git a/trunk/drivers/net/e1000e/ich8lan.c b/trunk/drivers/net/e1000e/ich8lan.c
@@ -2843,9 +2843,8 @@ void e1000e_disable_gig_wol_ich8lan(struct e1000_hw *hw)
 		            E1000_PHY_CTRL_GBE_DISABLE;
 		ew32(PHY_CTRL, phy_ctrl);
 
-		/* Workaround SWFLAG unexpectedly set during S0->Sx */
 		if (hw->mac.type == e1000_pchlan)
-			udelay(500);
+			e1000_phy_hw_reset_ich8lan(hw);
 	default:
 		break;
 	}