diff options
| author | Peter Hurley <peter@hurleysoftware.com> | 2016-01-10 22:40:51 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-01-27 15:01:42 -0800 |
| commit | 46b94e779e8a53b83e8d84e5aeb443d8b8bd45ea (patch) | |
| tree | a7b9f31587b0f86bd1384fa35744b8d3370053e4 /drivers/tty/serial/68328serial.c | |
| parent | 6aa56785e735fcfffffef7655f113b56f05c0df5 (diff) | |
| download | op-kernel-dev-46b94e779e8a53b83e8d84e5aeb443d8b8bd45ea.zip op-kernel-dev-46b94e779e8a53b83e8d84e5aeb443d8b8bd45ea.tar.gz | |
serial: 68328: Remove bogus ldisc reset
As the #warning indicates, the open-coded ldisc reset was always not ok.
Not only is this code long dead, but now it would have no effect as
the ldisc is destroyed when this driver's close() method returns; remove.
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty/serial/68328serial.c')
| -rw-r--r-- | drivers/tty/serial/68328serial.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/tty/serial/68328serial.c b/drivers/tty/serial/68328serial.c index 0982c1a..90639b5 100644 --- a/drivers/tty/serial/68328serial.c +++ b/drivers/tty/serial/68328serial.c @@ -1054,17 +1054,7 @@ static void rs_close(struct tty_struct *tty, struct file *filp) tty_ldisc_flush(tty); tty->closing = 0; tty_port_tty_set(&info->tport, NULL); -#warning "This is not and has never been valid so fix it" -#if 0 - if (tty->ldisc.num != ldiscs[N_TTY].num) { - if (tty->ldisc.close) - (tty->ldisc.close)(tty); - tty->ldisc = ldiscs[N_TTY]; - tty->termios.c_line = N_TTY; - if (tty->ldisc.open) - (tty->ldisc.open)(tty); - } -#endif + if (port->blocked_open) { if (port->close_delay) msleep_interruptible(jiffies_to_msecs(port->close_delay)); |
