[BNX2]: Use msleep().
authorArjan van de Ven <arjan@linux.intel.com>
Tue, 28 Aug 2007 21:34:43 +0000 (14:34 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 28 Aug 2007 21:34:43 +0000 (14:34 -0700)
bnx2.c (incorrectly) sets current->state directly to
TASK_UNINTERRUPTIBLE, without going through set_task_state(). However
all the code wants to do is an msleep so just make it do that instead...

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Acked-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bnx2.c

index 24e7f9ab3f5a72c76eeefd54b332152531c2b98b..00918602ba88a8d00a85c1d17fdf20fb2a7970f4 100644 (file)
@@ -3935,10 +3935,8 @@ bnx2_reset_chip(struct bnx2 *bp, u32 reset_code)
                REG_WR(bp, BNX2_PCICFG_MISC_CONFIG, val);
 
                if ((CHIP_ID(bp) == CHIP_ID_5706_A0) ||
-                   (CHIP_ID(bp) == CHIP_ID_5706_A1)) {
-                       current->state = TASK_UNINTERRUPTIBLE;
-                       schedule_timeout(HZ / 50);
-               }
+                   (CHIP_ID(bp) == CHIP_ID_5706_A1))
+                       msleep(20);
 
                /* Reset takes approximate 30 usec */
                for (i = 0; i < 10; i++) {