From e142a31da34b42458e10026b554e66127739cf23 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Tue, 1 Jun 2010 22:53:10 +0200 Subject: 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 Cc: Alan Cox Signed-off-by: Greg Kroah-Hartman --- drivers/serial/68328serial.c | 2 ++ drivers/serial/68360serial.c | 2 ++ drivers/serial/crisv10.c | 2 ++ 3 files changed, 6 insertions(+) (limited to 'drivers/serial') diff --git a/drivers/serial/68328serial.c b/drivers/serial/68328serial.c index 9330edb323e..d8204f4ebbb 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 edcf1cc089d..0dff3bbddc8 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 8e356c5eeae..5696710b6f2 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); -- cgit v1.2.3-18-g5258