aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/amiserial.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2010-06-01 16:53:10 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-10 16:47:44 -0400
commite142a31da34b42458e10026b554e66127739cf23 (patch)
tree1f65a42cd559116223e1fa1db7631cd449c73968 /drivers/char/amiserial.c
parentb07471fa51358ce64cc25e1501544502362e4404 (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/char/amiserial.c')
-rw-r--r--drivers/char/amiserial.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/amiserial.c b/drivers/char/amiserial.c
index 8228e61bb54d..a11c8c9ca3d4 100644
--- a/drivers/char/amiserial.c
+++ b/drivers/char/amiserial.c
@@ -1710,7 +1710,9 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp,
1710 printk("block_til_ready blocking: ttys%d, count = %d\n", 1710 printk("block_til_ready blocking: ttys%d, count = %d\n",
1711 info->line, state->count); 1711 info->line, state->count);
1712#endif 1712#endif
1713 tty_unlock();
1713 schedule(); 1714 schedule();
1715 tty_lock();
1714 } 1716 }
1715 __set_current_state(TASK_RUNNING); 1717 __set_current_state(TASK_RUNNING);
1716 remove_wait_queue(&info->open_wait, &wait); 1718 remove_wait_queue(&info->open_wait, &wait);