From 471a7461aec0c9ffd53220b1b5e6f08dd11c82c4 Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Fri, 29 May 2009 13:34:16 -0500 Subject: [PATCH] --- yaml --- r: 151386 b: refs/heads/master c: 430eb0d27c1b36c5191c16b2472b26137673a8d4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/pl2303.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cf77f1256d1b..7a5d296c3f7c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 830d1b188c997c4af094d4e20b194205ddbded13 +refs/heads/master: 430eb0d27c1b36c5191c16b2472b26137673a8d4 diff --git a/trunk/drivers/usb/serial/pl2303.c b/trunk/drivers/usb/serial/pl2303.c index e02dc3d643c7..6357b57f628c 100644 --- a/trunk/drivers/usb/serial/pl2303.c +++ b/trunk/drivers/usb/serial/pl2303.c @@ -927,6 +927,8 @@ static void pl2303_update_line_status(struct usb_serial_port *port, spin_lock_irqsave(&priv->lock, flags); priv->line_status = data[status_idx]; spin_unlock_irqrestore(&priv->lock, flags); + if (priv->line_status & UART_BREAK_ERROR) + usb_serial_handle_break(port); wake_up_interruptible(&priv->delta_msr_wait); } @@ -1037,7 +1039,8 @@ static void pl2303_read_bulk_callback(struct urb *urb) if (line_status & UART_OVERRUN_ERROR) tty_insert_flip_char(tty, 0, TTY_OVERRUN); for (i = 0; i < urb->actual_length; ++i) - tty_insert_flip_char(tty, data[i], tty_flag); + if (!usb_serial_handle_sysrq_char(port, data[i])) + tty_insert_flip_char(tty, data[i], tty_flag); tty_flip_buffer_push(tty); } tty_kref_put(tty);