---

yaml --- r: 110136 b: refs/heads/master c: 37f4023 h: refs/heads/master v: v3
git-mirror · Oct 3, 2008 · 5ec189a · 5ec189a
1 parent 75f6c75
commit 5ec189a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6babc32c41e3642d875372cb6afbd9ade7a9f311
+refs/heads/master: 37f40239f49fbc0b489d0327a700fee5b3898ac2
diff --git a/trunk/drivers/net/e1000e/ich8lan.c b/trunk/drivers/net/e1000e/ich8lan.c
@@ -1778,6 +1778,9 @@ static s32 e1000_reset_hw_ich8lan(struct e1000_hw *hw)
 	ew32(CTRL, (ctrl | E1000_CTRL_RST));
 	msleep(20);
 
+	/* release the swflag because it is not reset by hardware reset */
+	e1000_release_swflag_ich8lan(hw);
+
 	ret_val = e1000e_get_auto_rd_done(hw);
 	if (ret_val) {
 		/*