diff options
| author | Arjan van de Ven <arjan@linux.intel.com> | 2007-08-28 14:34:43 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-08-28 14:34:43 -0700 |
| commit | 8e54588161577435d64dfb5cfdf40a73a5705ea0 (patch) | |
| tree | a5554c75dd84e56adf03de38876a3167d7b88247 /drivers | |
| parent | b07d68b5ca4d55a16fab223d63d5fb36f89ff42f (diff) | |
| download | kernel_samsung_aries-8e54588161577435d64dfb5cfdf40a73a5705ea0.zip kernel_samsung_aries-8e54588161577435d64dfb5cfdf40a73a5705ea0.tar.gz kernel_samsung_aries-8e54588161577435d64dfb5cfdf40a73a5705ea0.tar.bz2 | |
[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')
| -rw-r--r-- | drivers/net/bnx2.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 24e7f9a..0091860 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++) { |