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

Commit 4d8c1dff authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman
Browse files

pty: Use spin_lock_irq() for pty_set_termios() 



The tty driver's set_termios() method is called with interrupts
enabled; there is no need to save and restore the local interrupt state.

Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Reviewed-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent dbfcd851

drivers/tty/pty.c

+2 −4
Original line number Diff line number Diff line
@@ -259,8 +259,6 @@ static int pty_open(struct tty_struct *tty, struct file *filp) 
static void pty_set_termios(struct tty_struct *tty,

					struct ktermios *old_termios)

{

	unsigned long flags;



	/* See if packet mode change of state. */

	if (tty->link && tty->link->packet) {

		int extproc = (old_termios->c_lflag & EXTPROC) |
@@ -272,7 +270,7 @@ static void pty_set_termios(struct tty_struct *tty, 
				STOP_CHAR(tty) == '\023' &&

				START_CHAR(tty) == '\021');

		if ((old_flow != new_flow) || extproc) {

			spin_lock_irqsave(&tty->ctrl_lock, flags);

			spin_lock_irq(&tty->ctrl_lock);

			if (old_flow != new_flow) {

				tty->ctrl_status &= ~(TIOCPKT_DOSTOP | TIOCPKT_NOSTOP);

				if (new_flow)
@@ -282,7 +280,7 @@ static void pty_set_termios(struct tty_struct *tty, 
			}

			if (extproc)

				tty->ctrl_status |= TIOCPKT_IOCTL;

			spin_unlock_irqrestore(&tty->ctrl_lock, flags);

			spin_unlock_irq(&tty->ctrl_lock);

			wake_up_interruptible(&tty->link->read_wait);

		}

	}