]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
USB: serial: ftd_sio: implement sysrq handling on break
authorJason Wessel <jason.wessel@windriver.com>
Mon, 11 May 2009 20:24:10 +0000 (15:24 -0500)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 16 Jun 2009 04:44:45 +0000 (21:44 -0700)
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>
drivers/usb/serial/ftdi_sio.c

index fc527de734653260d283062d09e7f20d5f1e3af6..fc423583eede884de17c91ddaa9c2191299baf5c 100644 (file)
@@ -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;
                }