public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] USB: pl2303: fix error characters not being reported to ldisc
@ 2009-10-08  9:36 Johan Hovold
  0 siblings, 0 replies; only message in thread
From: Johan Hovold @ 2009-10-08  9:36 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Alan Cox
  Cc: Frank Schaefer, Jason Wessel, linux-usb, linux-kernel

Fix regression introduced by commit
d4fc4a7bfc2dee626f4fec1e209e58eaa4312de6 (tty: Fix the PL2303 private
methods for sysrq).

Signed-off-by: Johan Hovold <jhovold@gmail.com>
---
 drivers/usb/serial/pl2303.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index 1128e01..9ec1a49 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -1046,13 +1046,15 @@ static void pl2303_push_data(struct tty_struct *tty,
 	/* overrun is special, not associated with a char */
 	if (line_status & UART_OVERRUN_ERROR)
 		tty_insert_flip_char(tty, 0, TTY_OVERRUN);
-	if (port->console && port->sysrq) {
+
+	if (tty_flag == TTY_NORMAL && !(port->console && port->sysrq))
+		tty_insert_flip_string(tty, data, urb->actual_length);
+	else {
 		int i;
 		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(tty, data, urb->actual_length);
+	}
 	tty_flip_buffer_push(tty);
 }
 
-- 
1.6.5.rc2


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2009-10-08  9:37 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-08  9:36 [PATCH] USB: pl2303: fix error characters not being reported to ldisc Johan Hovold

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox