diff options
Diffstat (limited to 'drivers/message/i2o')
| -rw-r--r-- | drivers/message/i2o/iop.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c index 61b837de4b6a..4eb53258842e 100644 --- a/drivers/message/i2o/iop.c +++ b/drivers/message/i2o/iop.c | |||
| @@ -93,8 +93,7 @@ u32 i2o_msg_get_wait(struct i2o_controller *c, | |||
| 93 | c->name); | 93 | c->name); |
| 94 | return I2O_QUEUE_EMPTY; | 94 | return I2O_QUEUE_EMPTY; |
| 95 | } | 95 | } |
| 96 | set_current_state(TASK_UNINTERRUPTIBLE); | 96 | schedule_timeout_uninterruptible(1); |
| 97 | schedule_timeout(1); | ||
| 98 | } | 97 | } |
| 99 | 98 | ||
| 100 | return m; | 99 | return m; |
| @@ -485,8 +484,7 @@ static int i2o_iop_init_outbound_queue(struct i2o_controller *c) | |||
| 485 | osm_warn("%s: Timeout Initializing\n", c->name); | 484 | osm_warn("%s: Timeout Initializing\n", c->name); |
| 486 | return -ETIMEDOUT; | 485 | return -ETIMEDOUT; |
| 487 | } | 486 | } |
| 488 | set_current_state(TASK_UNINTERRUPTIBLE); | 487 | schedule_timeout_uninterruptible(1); |
| 489 | schedule_timeout(1); | ||
| 490 | } | 488 | } |
| 491 | 489 | ||
| 492 | m = c->out_queue.phys; | 490 | m = c->out_queue.phys; |
| @@ -548,8 +546,7 @@ static int i2o_iop_reset(struct i2o_controller *c) | |||
| 548 | if (time_after(jiffies, timeout)) | 546 | if (time_after(jiffies, timeout)) |
| 549 | break; | 547 | break; |
| 550 | 548 | ||
| 551 | set_current_state(TASK_UNINTERRUPTIBLE); | 549 | schedule_timeout_uninterruptible(1); |
| 552 | schedule_timeout(1); | ||
| 553 | } | 550 | } |
| 554 | 551 | ||
| 555 | switch (*status) { | 552 | switch (*status) { |
| @@ -577,8 +574,7 @@ static int i2o_iop_reset(struct i2o_controller *c) | |||
| 577 | rc = -ETIMEDOUT; | 574 | rc = -ETIMEDOUT; |
| 578 | goto exit; | 575 | goto exit; |
| 579 | } | 576 | } |
| 580 | set_current_state(TASK_UNINTERRUPTIBLE); | 577 | schedule_timeout_uninterruptible(1); |
| 581 | schedule_timeout(1); | ||
| 582 | 578 | ||
| 583 | m = i2o_msg_get_wait(c, &msg, I2O_TIMEOUT_RESET); | 579 | m = i2o_msg_get_wait(c, &msg, I2O_TIMEOUT_RESET); |
| 584 | } | 580 | } |
| @@ -989,8 +985,7 @@ int i2o_status_get(struct i2o_controller *c) | |||
| 989 | return -ETIMEDOUT; | 985 | return -ETIMEDOUT; |
| 990 | } | 986 | } |
| 991 | 987 | ||
| 992 | set_current_state(TASK_UNINTERRUPTIBLE); | 988 | schedule_timeout_uninterruptible(1); |
| 993 | schedule_timeout(1); | ||
| 994 | } | 989 | } |
| 995 | 990 | ||
| 996 | #ifdef DEBUG | 991 | #ifdef DEBUG |