summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2010-05-08 15:18:41 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-20 13:21:44 -0700
commitd45cc8df7f59eb4db28408076ce979cd5e18f2b7 (patch)
treea41e5e65207c77346fc818cb411d20ef39ad283d
parent49b2597a86835a4eddcc02c7eafa2996aea58036 (diff)
downloadlinux-stable-d45cc8df7f59eb4db28408076ce979cd5e18f2b7.tar.gz
linux-stable-d45cc8df7f59eb4db28408076ce979cd5e18f2b7.tar.bz2
linux-stable-d45cc8df7f59eb4db28408076ce979cd5e18f2b7.zip
USB: pl2303: 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>
-rw-r--r--drivers/usb/serial/pl2303.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 18d1c44faa51..6b6001822279 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -786,12 +786,13 @@ static void pl2303_process_read_urb(struct urb *urb)
if (line_status & UART_OVERRUN_ERROR)
tty_insert_flip_char(tty, 0, TTY_OVERRUN);
- if (tty_flag == TTY_NORMAL && !(port->port.console && port->sysrq))
- tty_insert_flip_string(tty, data, urb->actual_length);
- else {
+ if (port->port.console && port->sysrq) {
for (i = 0; i < urb->actual_length; ++i)
if (!usb_serial_handle_sysrq_char(tty, port, data[i]))
tty_insert_flip_char(tty, data[i], tty_flag);
+ } else {
+ tty_insert_flip_string_fixed_flag(tty, data, tty_flag,
+ urb->actual_length);
}
tty_flip_buffer_push(tty);