diff options
author | Jason Wessel <jason.wessel@windriver.com> | 2009-05-11 16:24:10 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-16 00:44:45 -0400 |
commit | 72fda3ca6fc14662bb385d1e39e9e00af15b200d (patch) | |
tree | a3b78fe4a0ef25115ae686bf5115209ba0a5342b /drivers/usb/serial/ftdi_sio.c | |
parent | 98fcb5f78165b8a3d93870ad7afd4d9ebbb8b43a (diff) |
USB: serial: ftd_sio: implement sysrq handling on break
Change driver to make use of the new functions in
include/linux/usb/serial.h so as to allow the driver to handle the
sysrq
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/ftdi_sio.c')
-rw-r--r-- | drivers/usb/serial/ftdi_sio.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index fc527de73465..fc423583eede 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c | |||
@@ -2120,6 +2120,7 @@ static void ftdi_process_read(struct work_struct *work) | |||
2120 | if (data[packet_offset+1] & FTDI_RS_BI) { | 2120 | if (data[packet_offset+1] & FTDI_RS_BI) { |
2121 | error_flag = TTY_BREAK; | 2121 | error_flag = TTY_BREAK; |
2122 | dbg("BREAK received"); | 2122 | dbg("BREAK received"); |
2123 | usb_serial_handle_break(port); | ||
2123 | } | 2124 | } |
2124 | if (data[packet_offset+1] & FTDI_RS_PE) { | 2125 | if (data[packet_offset+1] & FTDI_RS_PE) { |
2125 | error_flag = TTY_PARITY; | 2126 | error_flag = TTY_PARITY; |
@@ -2134,8 +2135,11 @@ static void ftdi_process_read(struct work_struct *work) | |||
2134 | /* Note that the error flag is duplicated for | 2135 | /* Note that the error flag is duplicated for |
2135 | every character received since we don't know | 2136 | every character received since we don't know |
2136 | which character it applied to */ | 2137 | which character it applied to */ |
2137 | tty_insert_flip_char(tty, | 2138 | if (!usb_serial_handle_sysrq_char(port, |
2138 | data[packet_offset + i], error_flag); | 2139 | data[packet_offset + i])) |
2140 | tty_insert_flip_char(tty, | ||
2141 | data[packet_offset + i], | ||
2142 | error_flag); | ||
2139 | } | 2143 | } |
2140 | need_flip = 1; | 2144 | need_flip = 1; |
2141 | } | 2145 | } |