diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-08-18 00:15:47 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-08-21 03:34:45 -0400 |
commit | f335397d177c906256ee1bba28e8c49e8ec63817 (patch) | |
tree | b6911d0b40940cbec9083769856e7744d5461e22 /drivers/usb/serial | |
parent | 1495cc9df4e81f5a8fa9b0b8f1034b14d24b7d8c (diff) |
Input: sysrq - drop tty argument form handle_sysrq()
Sysrq operations do not accept tty argument anymore so no need to pass
it to us.
[Stephen Rothwell <sfr@canb.auug.org.au>: fix build breakage in drm code
caused by sysrq using bool but not including linux/types.h]
[Sachin Sant <sachinp@in.ibm.com>: fix build breakage in s390 keyboadr
driver]
Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Acked-by: Jason Wessel <jason.wessel@windriver.com>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r-- | drivers/usb/serial/generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c index ca92f67747cc..1e846cc3c7a4 100644 --- a/drivers/usb/serial/generic.c +++ b/drivers/usb/serial/generic.c | |||
@@ -453,7 +453,7 @@ int usb_serial_handle_sysrq_char(struct tty_struct *tty, | |||
453 | { | 453 | { |
454 | if (port->sysrq && port->port.console) { | 454 | if (port->sysrq && port->port.console) { |
455 | if (ch && time_before(jiffies, port->sysrq)) { | 455 | if (ch && time_before(jiffies, port->sysrq)) { |
456 | handle_sysrq(ch, tty); | 456 | handle_sysrq(ch); |
457 | port->sysrq = 0; | 457 | port->sysrq = 0; |
458 | return 1; | 458 | return 1; |
459 | } | 459 | } |