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

Commit a50f724a authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

TTY: pty, remove superfluous ptm test 



The code looks like:
if (tty->driver->subtype == PTY_TYPE_MASTER) {
  ...
  if (tty->driver == ptm_driver)

But the second if is superfluous because only the ptm_driver is of
PTY_TYPE_MASTER subtype.

Also we can remove the #if now because devpts_pty_kill is defined as
an empty function for non-CONFIG_UNIX98_PTYS configs.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Acked-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 81f5835e

drivers/tty/pty.c

+1 −4
Original line number Diff line number Diff line
@@ -54,10 +54,7 @@ static void pty_close(struct tty_struct *tty, struct file *filp) 
	wake_up_interruptible(&tty->link->write_wait);

	if (tty->driver->subtype == PTY_TYPE_MASTER) {

		set_bit(TTY_OTHER_CLOSED, &tty->flags);

#ifdef CONFIG_UNIX98_PTYS

		if (tty->driver == ptm_driver)

		devpts_pty_kill(tty->link);

#endif

		tty_unlock();

		tty_vhangup(tty->link);

		tty_lock();