---

yaml --- r: 111915 b: refs/heads/master c: 2e2e8d5 h: refs/heads/master i: 111913: 424834c 111911: 0d4d72c v: v3
git-mirror · Sep 25, 2008 · ebe710a · ebe710a
1 parent fd3db01
commit ebe710a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b75a442d2affb2ed20422054b1c640bd3b9c36a
+refs/heads/master: 2e2e8d53c3f34684af7a7475098b7524a6b854c2
diff --git a/trunk/drivers/net/e1000e/ich8lan.c b/trunk/drivers/net/e1000e/ich8lan.c
@@ -398,6 +398,8 @@ static s32 e1000_acquire_swflag_ich8lan(struct e1000_hw *hw)
 
 	if (!timeout) {
 		hw_dbg(hw, "FW or HW has locked the resource for too long.\n");
+		extcnf_ctrl &= ~E1000_EXTCNF_CTRL_SWFLAG;
+		ew32(EXTCNF_CTRL, extcnf_ctrl);
 		return -E1000_ERR_CONFIG;
 	}