projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge with /home/shaggy/git/linus-clean/
[powerpc.git]
/
drivers
/
sbus
/
char
/
aurora.c
diff --git
a/drivers/sbus/char/aurora.c
b/drivers/sbus/char/aurora.c
index
650d5e9
..
d96cc47
100644
(file)
--- 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) {
*/
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;
}
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) {
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);
}
}
wake_up_interruptible(&port->open_wait);
}