Commit 9de2a7ce authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman
Browse files

tty: Avoid unnecessary temporaries for tty->ldisc 



tty_ldisc_setup() is race-free and can reference tty->ldisc without
snapshots.

Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 133b1306

drivers/tty/tty_ldisc.c

+2 −5
Original line number Diff line number Diff line
@@ -752,17 +752,14 @@ void tty_ldisc_hangup(struct tty_struct *tty, bool reinit) 


int tty_ldisc_setup(struct tty_struct *tty, struct tty_struct *o_tty)

{

	struct tty_ldisc *ld = tty->ldisc;

	int retval;



	retval = tty_ldisc_open(tty, ld);

	int retval = tty_ldisc_open(tty, tty->ldisc);

	if (retval)

		return retval;



	if (o_tty) {

		retval = tty_ldisc_open(o_tty, o_tty->ldisc);

		if (retval) {

			tty_ldisc_close(tty, ld);

			tty_ldisc_close(tty, tty->ldisc);

			return retval;

		}

	}