From: Arjan van de Ven <arjan@linux.intel.com>
Date: Tue, 28 Aug 2007 21:34:43 +0000 (-0700)
Subject: [BNX2]: Use msleep().
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=8e54588161577435d64dfb5cfdf40a73a5705ea0;p=openwrt%2Fstaging%2Fblogic.git

[BNX2]: Use msleep().

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>
---

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 24e7f9ab3f5a..00918602ba88 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -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++) {