diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2010-06-01 22:53:10 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-10 13:47:44 -0700 |
| commit | e142a31da34b42458e10026b554e66127739cf23 (patch) | |
| tree | 1f65a42cd559116223e1fa1db7631cd449c73968 /drivers/serial | |
| parent | b07471fa51358ce64cc25e1501544502362e4404 (diff) | |
tty: release BTM while sleeping in block_til_ready
Most tty drivers may block while opening a device.
Since this possibly depends on another thread
closing it first and both threads may need the BTM,
we need to release it here.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/serial')
| -rw-r--r-- | drivers/serial/68328serial.c | 2 | ||||
| -rw-r--r-- | drivers/serial/68360serial.c | 2 | ||||
| -rw-r--r-- | drivers/serial/crisv10.c | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c index 9330edb323e2..d8204f4ebbb4 100644 --- a/drivers/serial/68328serial.c +++ b/drivers/serial/68328serial.c @@ -1235,7 +1235,9 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp, retval = -ERESTARTSYS; break; } + tty_unlock(); schedule(); + tty_lock(); } current->state = TASK_RUNNING; remove_wait_queue(&info->open_wait, &wait); diff --git a/drivers/serial/68360serial.c b/drivers/serial/68360serial.c index edcf1cc089d1..0dff3bbddc8b 100644 --- a/drivers/serial/68360serial.c +++ b/drivers/serial/68360serial.c @@ -1860,7 +1860,9 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp, printk("block_til_ready blocking: ttys%d, count = %d\n", info->line, state->count); #endif + tty_unlock(); schedule(); + tty_lock(); } current->state = TASK_RUNNING; remove_wait_queue(&info->open_wait, &wait); diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c index 8e356c5eeae0..5696710b6f2d 100644 --- a/drivers/serial/crisv10.c +++ b/drivers/serial/crisv10.c @@ -4066,7 +4066,9 @@ block_til_ready(struct tty_struct *tty, struct file * filp, printk("block_til_ready blocking: ttyS%d, count = %d\n", info->line, info->count); #endif + tty_unlock(); schedule(); + tty_lock(); } set_current_state(TASK_RUNNING); remove_wait_queue(&info->open_wait, &wait); |