USB: ftdi_sio: use tty_insert_flip_string_fixed_flag
authorJohan Hovold <jhovold@gmail.com>
Sat, 8 May 2010 13:19:06 +0000 (15:19 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 20 May 2010 20:21:44 +0000 (13:21 -0700)
Use tty_insert_flip_string_fixed_flag to report errors to line
discipline.

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/serial/ftdi_sio.c

index 14f7a34d614cc5b9bdb1e7073583838b33612787..6f1c05b2bdb7b7c5ef25b377c7a744645e47a61d 100644 (file)
@@ -1822,14 +1822,15 @@ static int ftdi_process_packet(struct tty_struct *tty,
                return 0;       /* status only */
        ch = packet + 2;
 
-       if (!(port->port.console && port->sysrq) && flag == TTY_NORMAL)
-               tty_insert_flip_string(tty, ch, len);
-       else {
+       if (port->port.console && port->sysrq) {
                for (i = 0; i < len; i++, ch++) {
                        if (!usb_serial_handle_sysrq_char(tty, port, *ch))
                                tty_insert_flip_char(tty, *ch, flag);
                }
+       } else {
+               tty_insert_flip_string_fixed_flag(tty, ch, flag, len);
        }
+
        return len;
 }