From: Peter Hurley <peter@hurleysoftware.com>
Date: Mon, 11 Jan 2016 06:41:08 +0000 (-0800)
Subject: tty: Avoid unnecessary temporaries for tty->ldisc
X-Git-Tag: v4.6-rc1~118^2~199
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9de2a7cef983579c725564950384e4ea205a7684;p=thirdparty%2Fkernel%2Flinux.git

tty: Avoid unnecessary temporaries for tty->ldisc

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

Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
index c6f970d630602..4cb5e572c7b8f 100644
--- a/drivers/tty/tty_ldisc.c
+++ b/drivers/tty/tty_ldisc.c
@@ -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;
 		}
 	}