diff options
| author | Alan Cox <alan@linux.intel.com> | 2012-07-14 15:32:50 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-16 13:08:17 -0700 |
| commit | 6a6c8b362be31fd9c1caa776313e0725dbed1cf9 (patch) | |
| tree | 39ecc503ed8be3449bfb727cb331991a5e748883 /drivers/usb/serial/kobil_sct.c | |
| parent | c97ce276909b0434cd74f9e6c7da37bda59106bb (diff) | |
| download | linux-3.10-6a6c8b362be31fd9c1caa776313e0725dbed1cf9.tar.gz linux-3.10-6a6c8b362be31fd9c1caa776313e0725dbed1cf9.tar.bz2 linux-3.10-6a6c8b362be31fd9c1caa776313e0725dbed1cf9.zip | |
usb, kobil: Sort out some bogus tty handling
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>
Diffstat (limited to 'drivers/usb/serial/kobil_sct.c')
| -rw-r--r-- | drivers/usb/serial/kobil_sct.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c index 0516a9661e2..bf5c74965d3 100644 --- a/drivers/usb/serial/kobil_sct.c +++ b/drivers/usb/serial/kobil_sct.c @@ -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; } |