aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/mxser.c
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2013-03-07 09:55:51 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-18 19:27:53 -0400
commit957dacaee56d18e5c2cbe722429de5a746a3cf44 (patch)
treed3043274b963ecf5c127bc6b77c94662ef056fd6 /drivers/tty/mxser.c
parente584a02cf517537a3d13c7f85ced45fd07ab85cd (diff)
TTY: fix DTR not being dropped on hang up
Move HUPCL handling to port shutdown so that DTR is dropped also on hang up (tty_port_close is a noop for hung-up ports). Also do not try to drop DTR for uninitialised ports where it has never been raised (e.g. after a failed open). Note that this is also the current behaviour of serial-core. Nine drivers currently call tty_port_close_start directly (rather than through tty_port_close) and seven of them lower DTR as part of their close (if the port has been initialised). Fixup the remaining two drivers so that it continues to be lowered also on normal (non-HUP) close. [ Note that most of those other seven drivers did not expect DTR to have been dropped by tty_port_close_start in the first place. ] Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/mxser.c')
-rw-r--r--drivers/tty/mxser.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c
index 484b6a3c9b03..d996038eacfd 100644
--- a/drivers/tty/mxser.c
+++ b/drivers/tty/mxser.c
@@ -1084,6 +1084,10 @@ static void mxser_close(struct tty_struct *tty, struct file *filp)
1084 mutex_lock(&port->mutex); 1084 mutex_lock(&port->mutex);
1085 mxser_close_port(port); 1085 mxser_close_port(port);
1086 mxser_flush_buffer(tty); 1086 mxser_flush_buffer(tty);
1087 if (test_bit(ASYNCB_INITIALIZED, &port->flags)) {
1088 if (C_HUPCL(tty))
1089 tty_port_lower_dtr_rts(port);
1090 }
1087 mxser_shutdown_port(port); 1091 mxser_shutdown_port(port);
1088 clear_bit(ASYNCB_INITIALIZED, &port->flags); 1092 clear_bit(ASYNCB_INITIALIZED, &port->flags);
1089 mutex_unlock(&port->mutex); 1093 mutex_unlock(&port->mutex);