diff options
author | Jason Wessel <jason.wessel@windriver.com> | 2010-03-08 22:50:12 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-20 16:21:31 -0400 |
commit | bd5afa9eac6daa408412a31a6c69e87e8bd28c7e (patch) | |
tree | 5f99e4ee9d787d038746c2217f7c1152fad3c453 /drivers/usb/serial/usb-serial.c | |
parent | 9757de384451a606af8c722213cb973192cbbd1b (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/usb-serial.c')
-rw-r--r-- | drivers/usb/serial/usb-serial.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index 3873660d8217..f3f65171de38 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c | |||
@@ -289,7 +289,7 @@ static void serial_down(struct tty_port *tport) | |||
289 | * The console is magical. Do not hang up the console hardware | 289 | * The console is magical. Do not hang up the console hardware |
290 | * or there will be tears. | 290 | * or there will be tears. |
291 | */ | 291 | */ |
292 | if (port->console) | 292 | if (port->port.console) |
293 | return; | 293 | return; |
294 | if (drv->close) | 294 | if (drv->close) |
295 | drv->close(port); | 295 | drv->close(port); |
@@ -328,7 +328,7 @@ static void serial_cleanup(struct tty_struct *tty) | |||
328 | /* The console is magical. Do not hang up the console hardware | 328 | /* The console is magical. Do not hang up the console hardware |
329 | * or there will be tears. | 329 | * or there will be tears. |
330 | */ | 330 | */ |
331 | if (port->console) | 331 | if (port->port.console) |
332 | return; | 332 | return; |
333 | 333 | ||
334 | dbg("%s - port %d", __func__, port->number); | 334 | dbg("%s - port %d", __func__, port->number); |