4 files changed, 51 insertions, 32 deletions

diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c
index 3dc3768ca71c..5f08702f672f 100644
--- a/drivers/usb/serial/ftdi_sio.c
+++ b/drivers/usb/serial/ftdi_sio.c
@@ -2121,7 +2121,7 @@ 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 */
-                                if (!usb_serial_handle_sysrq_char(port,
+                                if (!usb_serial_handle_sysrq_char(tty, port,
                                                 data[packet_offset + i]))
                                         tty_insert_flip_char(tty,
                                                 data[packet_offset + i],
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index 932d6241b787..ce57f6a32bdf 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -424,10 +424,17 @@ static void flush_and_resubmit_read_urb(struct usb_serial_port *port)
         if (!tty)
                 goto done;
 
-        /* Push data to tty */
-        for (i = 0; i < urb->actual_length; i++, ch++) {
-                if (!usb_serial_handle_sysrq_char(port, *ch))
-                        tty_insert_flip_char(tty, *ch, TTY_NORMAL);
+        /* The per character mucking around with sysrq path it too slow for
+           stuff like 3G modems, so shortcircuit it in the 99.9999999% of cases
+           where the USB serial is not a console anyway */
+        if (!port->console || !port->sysrq)
+                tty_insert_flip_string(tty, ch, urb->actual_length);
+        else {
+                /* Push data to tty */
+                for (i = 0; i < urb->actual_length; i++, ch++) {
+                        if (!usb_serial_handle_sysrq_char(tty, port, *ch))
+                                tty_insert_flip_char(tty, *ch, TTY_NORMAL);
+                }
         }
         tty_flip_buffer_push(tty);
         tty_kref_put(tty);
@@ -527,11 +534,12 @@ void usb_serial_generic_unthrottle(struct tty_struct *tty)
         }
 }
 
-int usb_serial_handle_sysrq_char(struct usb_serial_port *port, unsigned int ch)
+int usb_serial_handle_sysrq_char(struct tty_struct *tty,
+                        struct usb_serial_port *port, unsigned int ch)
 {
         if (port->sysrq && port->console) {
                 if (ch && time_before(jiffies, port->sysrq)) {
-                        handle_sysrq(ch, tty_port_tty_get(&port->port));
+                        handle_sysrq(ch, tty);
                         port->sysrq = 0;
                         return 1;
                 }
diff --git a/drivers/usb/serial/pl2303.c b/drivers/usb/serial/pl2303.c
index ec6c132a25b5..efaf59c4f5d0 100644
--- a/drivers/usb/serial/pl2303.c
+++ b/drivers/usb/serial/pl2303.c
@@ -971,18 +971,46 @@ exit:
                         __func__, retval);
 }
 
+static void pl2303_push_data(struct tty_struct *tty,
+                struct usb_serial_port *port, struct urb *urb,
+                u8 line_status)
+{
+        unsigned char *data = urb->transfer_buffer;
+        /* get tty_flag from status */
+        char tty_flag = TTY_NORMAL;
+        /* break takes precedence over parity, */
+        /* which takes precedence over framing errors */
+        if (line_status & UART_BREAK_ERROR)
+                tty_flag = TTY_BREAK;
+        else if (line_status & UART_PARITY_ERROR)
+                tty_flag = TTY_PARITY;
+        else if (line_status & UART_FRAME_ERROR)
+                tty_flag = TTY_FRAME;
+        dbg("%s - tty_flag = %d", __func__, tty_flag);
+
+        tty_buffer_request_room(tty, urb->actual_length + 1);
+        /* 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) {
+                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);
+}
+
 static void pl2303_read_bulk_callback(struct urb *urb)
 {
         struct usb_serial_port *port =  urb->context;
         struct pl2303_private *priv = usb_get_serial_port_data(port);
         struct tty_struct *tty;
-        unsigned char *data = urb->transfer_buffer;
         unsigned long flags;
-        int i;
         int result;
         int status = urb->status;
         u8 line_status;
-        char tty_flag;
 
         dbg("%s - port %d", __func__, port->number);
 
@@ -1010,10 +1038,7 @@ static void pl2303_read_bulk_callback(struct urb *urb)
         }
 
         usb_serial_debug_data(debug, &port->dev, __func__,
-                              urb->actual_length, data);
-
-        /* get tty_flag from status */
-        tty_flag = TTY_NORMAL;
+                              urb->actual_length, urb->transfer_buffer);
 
         spin_lock_irqsave(&priv->lock, flags);
         line_status = priv->line_status;
@@ -1021,26 +1046,9 @@ static void pl2303_read_bulk_callback(struct urb *urb)
         spin_unlock_irqrestore(&priv->lock, flags);
         wake_up_interruptible(&priv->delta_msr_wait);
 
-        /* break takes precedence over parity, */
-        /* which takes precedence over framing errors */
-        if (line_status & UART_BREAK_ERROR)
-                tty_flag = TTY_BREAK;
-        else if (line_status & UART_PARITY_ERROR)
-                tty_flag = TTY_PARITY;
-        else if (line_status & UART_FRAME_ERROR)
-                tty_flag = TTY_FRAME;
-        dbg("%s - tty_flag = %d", __func__, tty_flag);
-
         tty = tty_port_tty_get(&port->port);
         if (tty && urb->actual_length) {
-                tty_buffer_request_room(tty, urb->actual_length + 1);
-                /* overrun is special, not associated with a char */
-                if (line_status & UART_OVERRUN_ERROR)
-                        tty_insert_flip_char(tty, 0, TTY_OVERRUN);
-                for (i = 0; i < urb->actual_length; ++i)
-                        if (!usb_serial_handle_sysrq_char(port, data[i]))
-                                tty_insert_flip_char(tty, data[i], tty_flag);
-                tty_flip_buffer_push(tty);
+                pl2303_push_data(tty, port, urb, line_status);
         }
         tty_kref_put(tty);
         /* Schedule the next read _if_ we are still open */
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index d595aa5586a7..a84216464ca0 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -333,6 +333,9 @@ static void serial_close(struct tty_struct *tty, struct file *filp)
 {
         struct usb_serial_port *port = tty->driver_data;
 
+        if (!port)
+                return;
+
         dbg("%s - port %d", __func__, port->number);