aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/tty_ldisc.c
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2013-03-11 16:44:33 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-18 19:44:02 -0400
commitd912156605b0eb3b3070dc7eabc43db6379aa43b (patch)
treeac7fb32024a2e11ae94ee14401c652fc427ff2b2 /drivers/tty/tty_ldisc.c
parentb66f4fa509153ca9d313075806d5c6425dfa43c5 (diff)
tty: Don't reenable already enabled ldisc
tty_ldisc_hangup() guarantees the ldisc is enabled (or that there is no ldisc). Since __tty_hangup() was the only user, re-define tty_ldisc_enable() in file-scope. Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/tty_ldisc.c')
-rw-r--r--drivers/tty/tty_ldisc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
index 37671fcc7e4c..9c727da59fac 100644
--- a/drivers/tty/tty_ldisc.c
+++ b/drivers/tty/tty_ldisc.c
@@ -373,7 +373,7 @@ static inline void tty_ldisc_put(struct tty_ldisc *ld)
373 * Clearing directly is allowed. 373 * Clearing directly is allowed.
374 */ 374 */
375 375
376void tty_ldisc_enable(struct tty_struct *tty) 376static void tty_ldisc_enable(struct tty_struct *tty)
377{ 377{
378 clear_bit(TTY_LDISC_HALTED, &tty->flags); 378 clear_bit(TTY_LDISC_HALTED, &tty->flags);
379 set_bit(TTY_LDISC, &tty->flags); 379 set_bit(TTY_LDISC, &tty->flags);