Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e142a31d authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b07471fa

drivers/char/amiserial.c

+2 −0
Original line number Diff line number Diff line
@@ -1710,7 +1710,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();

	}

	__set_current_state(TASK_RUNNING);

	remove_wait_queue(&info->open_wait, &wait);

drivers/char/ip2/ip2main.c

+4 −0
Original line number Diff line number Diff line
@@ -1486,7 +1486,9 @@ ip2_open( PTTY tty, struct file *pFile ) 


	if ( tty_hung_up_p(pFile) || ( pCh->flags & ASYNC_CLOSING )) {

		if ( pCh->flags & ASYNC_CLOSING ) {

			tty_unlock();

			schedule();

			tty_lock();

		}

		if ( tty_hung_up_p(pFile) ) {

			set_current_state( TASK_RUNNING );
@@ -1548,7 +1550,9 @@ ip2_open( PTTY tty, struct file *pFile ) 
			rc = (( pCh->flags & ASYNC_HUP_NOTIFY ) ? -EAGAIN : -ERESTARTSYS);

			break;

		}

		tty_unlock();

		schedule();

		tty_lock();

	}

	set_current_state( TASK_RUNNING );

	remove_wait_queue(&pCh->open_wait, &wait);

drivers/char/serial167.c

+3 −1
Original line number Diff line number Diff line
@@ -1786,7 +1786,9 @@ block_til_ready(struct tty_struct *tty, struct file *filp, 
		       tty->name, info->count);

		/**/

#endif

		tty_unlock();

		schedule();

		tty_lock();

	}

	__set_current_state(TASK_RUNNING);

	remove_wait_queue(&info->open_wait, &wait);

drivers/char/specialix.c

+2 −0
Original line number Diff line number Diff line
@@ -1365,7 +1365,9 @@ static int block_til_ready(struct tty_struct *tty, struct file *filp, 
			retval = -ERESTARTSYS;

			break;

		}

		tty_unlock();

		schedule();

		tty_lock();

	}



	set_current_state(TASK_RUNNING);

drivers/char/synclink.c

+2 −0
Original line number Diff line number Diff line
@@ -3349,7 +3349,9 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp, 
			printk("%s(%d):block_til_ready blocking on %s count=%d\n",

				 __FILE__,__LINE__, tty->driver->name, port->count );

				 

		tty_unlock();

		schedule();

		tty_lock();

	}

	

	set_current_state(TASK_RUNNING);