]> git.karo-electronics.de Git - linux-beck.git/commitdiff
usb, kobil: Sort out some bogus tty handling
authorAlan Cox <alan@linux.intel.com>
Sat, 14 Jul 2012 14:32:50 +0000 (15:32 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Jul 2012 20:08:17 +0000 (13:08 -0700)
Stuff noticed while doing the termios conversion.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/serial/kobil_sct.c

index 0516a9661e2fb9b0f6c31aeb6ac3bc3c85a174dc..bf5c74965d3467603066511d8259600559a6a043 100644 (file)
@@ -192,8 +192,8 @@ static void kobil_init_termios(struct tty_struct *tty)
 {
        /* Default to echo off and other sane device settings */
        tty->termios.c_lflag = 0;
-       tty->termios.c_lflag &= ~(ISIG | ICANON | ECHO | IEXTEN | XCASE);
-       tty->termios.c_lflag = IGNBRK | IGNPAR | IXOFF;
+       tty->termios.c_iflag &= ~(ISIG | ICANON | ECHO | IEXTEN | XCASE);
+       tty->termios.c_iflag |= IGNBRK | IGNPAR | IXOFF;
        /* do NOT translate CR to CR-NL (0x0A -> 0x0A 0x0D) */
        tty->termios.c_oflag &= ~ONLCR;
 }
@@ -588,7 +588,7 @@ static void kobil_set_termios(struct tty_struct *tty,
        if (priv->device_type == KOBIL_USBTWIN_PRODUCT_ID ||
                        priv->device_type == KOBIL_KAAN_SIM_PRODUCT_ID) {
                /* This device doesn't support ioctl calls */
-               tty->termios = *old;
+               tty_termios_copy_hw(&tty->termios, old);
                return;
        }