summaryrefslogtreecommitdiff
path: root/drivers/usb/serial/usb-serial.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-04-13 15:27:28 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2010-04-13 15:27:35 +1000
commit4df1b81b9746e9960d171d9c35d9311182fc9e3f (patch)
tree1061424aeb7bc2cc65b46c1516f9397a25a2d4c1 /drivers/usb/serial/usb-serial.c
parent0169b0812e1a237b6e493f118e89ebb3c4abdd4d (diff)
parent50be717773eb1d77d0a02f1b307cfe7b36121d03 (diff)
Merge branch 'quilt/usb'
Diffstat (limited to 'drivers/usb/serial/usb-serial.c')
-rw-r--r--drivers/usb/serial/usb-serial.c4
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)
* The console is magical. Do not hang up the console hardware
* or there will be tears.
*/
- if (port->console)
+ if (port->port.console)
return;
if (drv->close)
drv->close(port);
@@ -328,7 +328,7 @@ static void serial_cleanup(struct tty_struct *tty)
/* The console is magical. Do not hang up the console hardware
* or there will be tears.
*/
- if (port->console)
+ if (port->port.console)
return;
dbg("%s - port %d", __func__, port->number);