From 0fbd93a6b7b38b29e3ad2d1caaa65c9bd4a9cd62 Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Mon, 11 May 2009 15:24:10 -0500 Subject: [PATCH] --- yaml --- r: 151367 b: refs/heads/master c: 72fda3ca6fc14662bb385d1e39e9e00af15b200d h: refs/heads/master i: 151365: 742794e7d03fac715b6dd8558bc9c6623c948e82 151363: e6fa983600820b7159a1c3d480416f2813b2a7f0 151359: 648c969c802571bd696b05af747686e8321be126 v: v3 --- [refs] | 2 +- trunk/drivers/usb/serial/ftdi_sio.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 830ff1ae7e60..59a7d42057ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 98fcb5f78165b8a3d93870ad7afd4d9ebbb8b43a +refs/heads/master: 72fda3ca6fc14662bb385d1e39e9e00af15b200d diff --git a/trunk/drivers/usb/serial/ftdi_sio.c b/trunk/drivers/usb/serial/ftdi_sio.c index fc527de73465..fc423583eede 100644 --- a/trunk/drivers/usb/serial/ftdi_sio.c +++ b/trunk/drivers/usb/serial/ftdi_sio.c @@ -2120,6 +2120,7 @@ static void ftdi_process_read(struct work_struct *work) if (data[packet_offset+1] & FTDI_RS_BI) { error_flag = TTY_BREAK; dbg("BREAK received"); + usb_serial_handle_break(port); } if (data[packet_offset+1] & FTDI_RS_PE) { error_flag = TTY_PARITY; @@ -2134,8 +2135,11 @@ static void ftdi_process_read(struct work_struct *work) /* Note that the error flag is duplicated for every character received since we don't know which character it applied to */ - tty_insert_flip_char(tty, - data[packet_offset + i], error_flag); + if (!usb_serial_handle_sysrq_char(port, + data[packet_offset + i])) + tty_insert_flip_char(tty, + data[packet_offset + i], + error_flag); } need_flip = 1; }