]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
serial: 68328: Remove bogus ldisc reset
authorPeter Hurley <peter@hurleysoftware.com>
Mon, 11 Jan 2016 06:40:51 +0000 (22:40 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 27 Jan 2016 23:01:42 +0000 (15:01 -0800)
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>
drivers/tty/serial/68328serial.c

index 0982c1a441873546403b4ed3f68843cad27a84a1..90639b590a10216e76b618e5da27d233eb34e09a 100644 (file)
@@ -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));