USB: ftdi_sio: use tty_insert_flip_string_fixed_flag

[safe/jmp/linux-2.6] / drivers / usb / serial / ftdi_sio.c

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 14f7a34..6f1c05b 100644 (file)
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -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;
 }