aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/generic.c
diff options
context:
space:
mode:
authorJason Wessel <jason.wessel@windriver.com>2010-03-08 22:50:12 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-20 16:21:31 -0400
commitbd5afa9eac6daa408412a31a6c69e87e8bd28c7e (patch)
tree5f99e4ee9d787d038746c2217f7c1152fad3c453 /drivers/usb/serial/generic.c
parent9757de384451a606af8c722213cb973192cbbd1b (diff)
usb-serial: Use tty_port version console instead of usb_serial_port
Replace all instances of using the console variable in struct usb_serial_port with the struct tty_port version. CC: Alan Cox <alan@linux.intel.com> CC: Alan Stern <stern@rowland.harvard.edu> CC: Oliver Neukum <oliver@neukum.org> CC: Andrew Morton <akpm@linux-foundation.org> CC: linux-usb@vger.kernel.org CC: linux-kernel@vger.kernel.org Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/generic.c')
-rw-r--r--drivers/usb/serial/generic.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c
index f804acb138ec..ba61c745df0b 100644
--- a/drivers/usb/serial/generic.c
+++ b/drivers/usb/serial/generic.c
@@ -447,7 +447,7 @@ static void flush_and_resubmit_read_urb(struct usb_serial_port *port)
447 /* The per character mucking around with sysrq path it too slow for 447 /* The per character mucking around with sysrq path it too slow for
448 stuff like 3G modems, so shortcircuit it in the 99.9999999% of cases 448 stuff like 3G modems, so shortcircuit it in the 99.9999999% of cases
449 where the USB serial is not a console anyway */ 449 where the USB serial is not a console anyway */
450 if (!port->console || !port->sysrq) 450 if (!port->port.console || !port->sysrq)
451 tty_insert_flip_string(tty, ch, urb->actual_length); 451 tty_insert_flip_string(tty, ch, urb->actual_length);
452 else { 452 else {
453 /* Push data to tty */ 453 /* Push data to tty */
@@ -561,7 +561,7 @@ void usb_serial_generic_unthrottle(struct tty_struct *tty)
561int usb_serial_handle_sysrq_char(struct tty_struct *tty, 561int usb_serial_handle_sysrq_char(struct tty_struct *tty,
562 struct usb_serial_port *port, unsigned int ch) 562 struct usb_serial_port *port, unsigned int ch)
563{ 563{
564 if (port->sysrq && port->console) { 564 if (port->sysrq && port->port.console) {
565 if (ch && time_before(jiffies, port->sysrq)) { 565 if (ch && time_before(jiffies, port->sysrq)) {
566 handle_sysrq(ch, tty); 566 handle_sysrq(ch, tty);
567 port->sysrq = 0; 567 port->sysrq = 0;