From ebe710a52028253a416ca67ed20a671ace98380f Mon Sep 17 00:00:00 2001 From: Bruce Allan Date: Tue, 23 Sep 2008 15:46:38 -0700 Subject: [PATCH] --- yaml --- r: 111915 b: refs/heads/master c: 2e2e8d53c3f34684af7a7475098b7524a6b854c2 h: refs/heads/master i: 111913: 424834ccc0cb512f0620fee5288a1799b304ee17 111911: 0d4d72c8d5daaf93eda45252f36e246e3477dfb8 v: v3 --- [refs] | 2 +- trunk/drivers/net/e1000e/ich8lan.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 49a1e532ba1e..baaf02f44b90 100644 --- 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 index 019b9c0bcdcb..692251b60915 100644 --- 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; }