aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@linux.intel.com>2007-08-28 17:34:43 -0400
committerDavid S. Miller <davem@davemloft.net>2007-08-28 17:34:43 -0400
commit8e54588161577435d64dfb5cfdf40a73a5705ea0 (patch)
treea5554c75dd84e56adf03de38876a3167d7b88247 /drivers/net
parentb07d68b5ca4d55a16fab223d63d5fb36f89ff42f (diff)
[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>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/bnx2.c6
1 files changed, 2 insertions, 4 deletions
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)
3935 REG_WR(bp, BNX2_PCICFG_MISC_CONFIG, val); 3935 REG_WR(bp, BNX2_PCICFG_MISC_CONFIG, val);
3936 3936
3937 if ((CHIP_ID(bp) == CHIP_ID_5706_A0) || 3937 if ((CHIP_ID(bp) == CHIP_ID_5706_A0) ||
3938 (CHIP_ID(bp) == CHIP_ID_5706_A1)) { 3938 (CHIP_ID(bp) == CHIP_ID_5706_A1))
3939 current->state = TASK_UNINTERRUPTIBLE; 3939 msleep(20);
3940 schedule_timeout(HZ / 50);
3941 }
3942 3940
3943 /* Reset takes approximate 30 usec */ 3941 /* Reset takes approximate 30 usec */
3944 for (i = 0; i < 10; i++) { 3942 for (i = 0; i < 10; i++) {