]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
e1000e: reset swflag after resetting hardware
authorJesse Brandeburg <jesse.brandeburg@intel.com>
Thu, 2 Oct 2008 23:33:20 +0000 (16:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 3 Oct 2008 01:28:12 +0000 (18:28 -0700)
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 <jesse.brandeburg@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/net/e1000e/ich8lan.c

index d8efba8841343237e278092b4a8a2089ad894c5c..f4b6744d71df94744849569bd60265e0ba9c5df8 100644 (file)
@@ -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) {
                /*