lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

USB: ftdi_sio: use tty_insert_flip_string_fixed_flag

Browse Source 
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>
This commit is contained in:
Johan Hovold
2010-05-08 15:19:06 +02:00
committed by Greg Kroah-Hartman
parent 0954e1c258
commit 49b2597a86
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/usb/serial/ftdi_sio.c
View File

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