From: Jesse Brandeburg Date: Thu, 2 Oct 2008 23:33:20 +0000 (-0700) Subject: e1000e: reset swflag after resetting hardware X-Git-Tag: v2.6.27-rc9~34 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=37f40239f49fbc0b489d0327a700fee5b3898ac2;p=linux-2.6-omap-h63xx.git e1000e: reset swflag after resetting hardware in the process of debugging things, noticed that the swflag is not reset by the driver after reset, and the swflag is probably not reset unless management firmware clears it after 100ms. Signed-off-by: Jesse Brandeburg Signed-off-by: Linus Torvalds --- diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c index d8efba88413..f4b6744d71d 100644 --- a/drivers/net/e1000e/ich8lan.c +++ b/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) { /*