From: Ben Hutchings <ben@decadent.org.uk>
Date: Sat, 11 Dec 2010 05:51:39 +0000 (+0000)
Subject: TTY: Fix error return from tty_ldisc_open()
X-Git-Tag: firefly_0821_release~10186^2~620
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6db0ed1582b1eae8b1120de4494cafc9635fdc3f;p=firefly-linux-kernel-4.4.55.git

TTY: Fix error return from tty_ldisc_open()

The backported version of "TTY: ldisc, fix open flag handling" in
2.6.32.27 causes tty_ldisc_open() to return 0 on error.  Fix that.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/char/tty_ldisc.c b/drivers/char/tty_ldisc.c
index 8b9f1a5c8be8..cf0bfc6b1dbd 100644
--- a/drivers/char/tty_ldisc.c
+++ b/drivers/char/tty_ldisc.c
@@ -451,6 +451,7 @@ static int tty_ldisc_open(struct tty_struct *tty, struct tty_ldisc *ld)
 		ret = ld->ops->open(tty);
 		if (ret)
 			clear_bit(TTY_LDISC_OPEN, &tty->flags);
+		return ret;
 	}
 	return 0;
 }