git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
[pandora-kernel.git]
/
drivers
/
tty
/
synclinkmp.c
diff --git
a/drivers/tty/synclinkmp.c
b/drivers/tty/synclinkmp.c
index
a3dddc1
..
4a1e4f0
100644
(file)
--- a/
drivers/tty/synclinkmp.c
+++ b/
drivers/tty/synclinkmp.c
@@
-3357,9
+3357,9
@@
static int block_til_ready(struct tty_struct *tty, struct file *filp,
printk("%s(%d):%s block_til_ready() count=%d\n",
__FILE__,__LINE__, tty->driver->name, port->count );
- tty_unlock();
+ tty_unlock(
tty
);
schedule();
- tty_lock();
+ tty_lock(
tty
);
}
set_current_state(TASK_RUNNING);