From: Alan Cox Date: Sat, 14 Jul 2012 14:32:50 +0000 (+0100) Subject: usb, kobil: Sort out some bogus tty handling X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6a6c8b362be31fd9c1caa776313e0725dbed1cf9;p=linux-beck.git usb, kobil: Sort out some bogus tty handling Stuff noticed while doing the termios conversion. Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c index 0516a9661e2f..bf5c74965d34 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; }