summaryrefslogtreecommitdiff
path: root/drivers/char
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2010-12-11 05:51:39 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2011-01-07 14:43:01 -0800
commit6db0ed1582b1eae8b1120de4494cafc9635fdc3f (patch)
treefa552f726c246a2991af2fc6b454fcaaff4ec184 /drivers/char
parenta386bf75dea7208041b5d4b8d44726876e28ee4b (diff)
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>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/tty_ldisc.c1
1 files changed, 1 insertions, 0 deletions
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;
}