|
@@ -343,7 +343,7 @@ void usb_serial_generic_process_read_urb(struct urb *urb)
|
|
|
tty_insert_flip_string(tty, ch, urb->actual_length);
|
|
|
else {
|
|
|
for (i = 0; i < urb->actual_length; i++, ch++) {
|
|
|
- if (!usb_serial_handle_sysrq_char(tty, port, *ch))
|
|
|
+ if (!usb_serial_handle_sysrq_char(port, *ch))
|
|
|
tty_insert_flip_char(tty, *ch, TTY_NORMAL);
|
|
|
}
|
|
|
}
|
|
@@ -448,8 +448,7 @@ void usb_serial_generic_unthrottle(struct tty_struct *tty)
|
|
|
EXPORT_SYMBOL_GPL(usb_serial_generic_unthrottle);
|
|
|
|
|
|
#ifdef CONFIG_MAGIC_SYSRQ
|
|
|
-int usb_serial_handle_sysrq_char(struct tty_struct *tty,
|
|
|
- struct usb_serial_port *port, unsigned int ch)
|
|
|
+int usb_serial_handle_sysrq_char(struct usb_serial_port *port, unsigned int ch)
|
|
|
{
|
|
|
if (port->sysrq && port->port.console) {
|
|
|
if (ch && time_before(jiffies, port->sysrq)) {
|
|
@@ -462,8 +461,7 @@ int usb_serial_handle_sysrq_char(struct tty_struct *tty,
|
|
|
return 0;
|
|
|
}
|
|
|
#else
|
|
|
-int usb_serial_handle_sysrq_char(struct tty_struct *tty,
|
|
|
- struct usb_serial_port *port, unsigned int ch)
|
|
|
+int usb_serial_handle_sysrq_char(struct usb_serial_port *port, unsigned int ch)
|
|
|
{
|
|
|
return 0;
|
|
|
}
|