From: Alan Cox Fix nozomi as well. Signed-off-by: Alan Cox Signed-off-by: Andrew Morton --- drivers/char/nozomi.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff -puN drivers/char/nozomi.c~tty-switch-to-ktermios-nozomi-fix drivers/char/nozomi.c --- a/drivers/char/nozomi.c~tty-switch-to-ktermios-nozomi-fix +++ a/drivers/char/nozomi.c @@ -456,8 +456,8 @@ typedef struct { struct workqueue_struct *tty_flip_wq; struct work_struct tty_flip_wq_struct; - struct termios *tty_termios[NTTY_TTY_MINORS]; - struct termios *tty_termios_locked[NTTY_TTY_MINORS]; + struct ktermios *tty_termios[NTTY_TTY_MINORS]; + struct ktermios *tty_termios_locked[NTTY_TTY_MINORS]; spinlock_t spin_mutex; u32 open_ttys; @@ -1008,9 +1008,6 @@ static int receive_data(enum port_type i i = 0; while (i < 4 && size > 0) { - if (tty_buffer_request_room(tty, 1) < 1) { - tty_flip_buffer_push(tty); - } tty_insert_flip_char(tty, buf[i], TTY_NORMAL); port->rx_data++; i++; @@ -1872,7 +1869,7 @@ static int ntty_write_room(struct tty_st /* Sets termios flags, called by the tty layer. */ static void ntty_set_termios(struct tty_struct *tty, - struct termios *old_termios) + struct ktermios *old_termios) { unsigned int cflag; _