Skip to contentSkip to conversation

USB: pl2303: fix error characters not being reported to ldisc

PATCH New Johan Hovold 1 participant 1 message Oct 8, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 USB: pl2303: fix error characters not being reported to ldisc

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

---
 drivers/usb/serial/pl2303.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
drivers/usb/serial/pl2303.c +5 -3
index 1128e01..9ec1a49 100644
@@ -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);
 }
 
Signature · 1 line
1.6.5.rc2