diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-07-26 00:46:44 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-07-26 00:46:44 +0200 |
| commit | 05cb784c81a0fd1f97732156ea464bd392ce875a (patch) | |
| tree | 24122979b411dcec6ff390fc9ae84ad9413128e9 /drivers/sbus/char/aurora.c | |
| parent | Auto merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/li... (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-05cb784c81a0fd1f97732156ea464bd392ce875a.tar.xz linux-05cb784c81a0fd1f97732156ea464bd392ce875a.zip | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/sbus/char/aurora.c')
| -rw-r--r-- | drivers/sbus/char/aurora.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/sbus/char/aurora.c b/drivers/sbus/char/aurora.c index 650d5e924f47..d96cc47de566 100644 --- a/drivers/sbus/char/aurora.c +++ b/drivers/sbus/char/aurora.c @@ -1515,8 +1515,7 @@ static void aurora_close(struct tty_struct * tty, struct file * filp) */ timeout = jiffies+HZ; while(port->SRER & SRER_TXEMPTY) { - current->state = TASK_INTERRUPTIBLE; - schedule_timeout(port->timeout); + msleep_interruptible(jiffies_to_msecs(port->timeout)); if (time_after(jiffies, timeout)) break; } @@ -1533,8 +1532,7 @@ static void aurora_close(struct tty_struct * tty, struct file * filp) port->tty = 0; if (port->blocked_open) { if (port->close_delay) { - current->state = TASK_INTERRUPTIBLE; - schedule_timeout(port->close_delay); + msleep_interruptible(jiffies_to_msecs(port->close_delay)); } wake_up_interruptible(&port->open_wait); } |