diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 20:29:23 +0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 20:29:23 +0400 |
| commit | 7a9f8f93d2dad38f30fbc79d8a1e6517373aa4b6 (patch) | |
| tree | 9116e5bde860d00685c5b6eee7be5ba9899aabb9 /drivers/net/irda/stir4200.c | |
| parent | 972c26bdd6b58e7534473c4f7928584578cf43f4 (diff) | |
| parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) | |
| download | linux-7a9f8f93d2dad38f30fbc79d8a1e6517373aa4b6.tar.xz | |
Merge branch 'master'
Diffstat (limited to 'drivers/net/irda/stir4200.c')
| -rw-r--r-- | drivers/net/irda/stir4200.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/irda/stir4200.c b/drivers/net/irda/stir4200.c index 15f207323d97..3961a754e920 100644 --- a/drivers/net/irda/stir4200.c +++ b/drivers/net/irda/stir4200.c @@ -678,10 +678,9 @@ static void turnaround_delay(const struct stir_cb *stir, long us) return; ticks = us / (1000000 / HZ); - if (ticks > 0) { - current->state = TASK_INTERRUPTIBLE; - schedule_timeout(1 + ticks); - } else + if (ticks > 0) + schedule_timeout_interruptible(1 + ticks); + else udelay(us); } |