diff options
Diffstat (limited to 'drivers/usb/serial/generic.c')
-rw-r--r-- | drivers/usb/serial/generic.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c index 3d8dc5671bea..ce57f6a32bdf 100644 --- a/drivers/usb/serial/generic.c +++ b/drivers/usb/serial/generic.c | |||
@@ -432,7 +432,7 @@ static void flush_and_resubmit_read_urb(struct usb_serial_port *port) | |||
432 | else { | 432 | else { |
433 | /* Push data to tty */ | 433 | /* Push data to tty */ |
434 | for (i = 0; i < urb->actual_length; i++, ch++) { | 434 | for (i = 0; i < urb->actual_length; i++, ch++) { |
435 | if (!usb_serial_handle_sysrq_char(port, *ch)) | 435 | if (!usb_serial_handle_sysrq_char(tty, port, *ch)) |
436 | tty_insert_flip_char(tty, *ch, TTY_NORMAL); | 436 | tty_insert_flip_char(tty, *ch, TTY_NORMAL); |
437 | } | 437 | } |
438 | } | 438 | } |
@@ -534,11 +534,12 @@ void usb_serial_generic_unthrottle(struct tty_struct *tty) | |||
534 | } | 534 | } |
535 | } | 535 | } |
536 | 536 | ||
537 | int usb_serial_handle_sysrq_char(struct usb_serial_port *port, unsigned int ch) | 537 | int usb_serial_handle_sysrq_char(struct tty_struct *tty, |
538 | struct usb_serial_port *port, unsigned int ch) | ||
538 | { | 539 | { |
539 | if (port->sysrq && port->console) { | 540 | if (port->sysrq && port->console) { |
540 | if (ch && time_before(jiffies, port->sysrq)) { | 541 | if (ch && time_before(jiffies, port->sysrq)) { |
541 | handle_sysrq(ch, tty_port_tty_get(&port->port)); | 542 | handle_sysrq(ch, tty); |
542 | port->sysrq = 0; | 543 | port->sysrq = 0; |
543 | return 1; | 544 | return 1; |
544 | } | 545 | } |