aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/ftdi_sio.c
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2010-05-08 15:19:06 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-20 13:21:44 -0700
commit49b2597a86835a4eddcc02c7eafa2996aea58036 (patch)
tree8686b0793202ce6ff9fa011c81b55452b57660c2 /drivers/usb/serial/ftdi_sio.c
parent0954e1c258c4018bfd370da41fbb5deb34582976 (diff)
downloadmrst-s0i3-test-49b2597a86835a4eddcc02c7eafa2996aea58036.tar.gz
mrst-s0i3-test-49b2597a86835a4eddcc02c7eafa2996aea58036.tar.xz
mrst-s0i3-test-49b2597a86835a4eddcc02c7eafa2996aea58036.zip
USB: ftdi_sio: use tty_insert_flip_string_fixed_flag
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>
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
-rw-r--r--drivers/usb/serial/ftdi_sio.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 14f7a34d614..6f1c05b2bdb 100644
--- 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;
}