summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/console.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-03-22 20:05:26 -0700
committerDavid S. Miller <davem@davemloft.net>2010-03-22 20:05:26 -0700
commit91c030b4d6445ebe9fbddb86d584441f300df15c (patch)
treee8a48e3ad9e0448c690268175e555fa651983546 /drivers/usb/serial/console.c
parent7c3456fdb503071787f7f972de1069b9cacd16f0 (diff)
parentae6be51ed01d6c4aaf249a207b4434bc7785853b (diff)
downloadkernel-crypto-91c030b4d6445ebe9fbddb86d584441f300df15c.tar.gz
kernel-crypto-91c030b4d6445ebe9fbddb86d584441f300df15c.tar.xz
kernel-crypto-91c030b4d6445ebe9fbddb86d584441f300df15c.zip
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/usb/serial/console.c')
-rw-r--r--drivers/usb/serial/console.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/usb/serial/console.c b/drivers/usb/serial/console.c
index b22ac325852..f347da2ef00 100644
--- a/drivers/usb/serial/console.c
+++ b/drivers/usb/serial/console.c
@@ -181,6 +181,7 @@ static int usb_console_setup(struct console *co, char *options)
/* The console is special in terms of closing the device so
* indicate this port is now acting as a system console. */
port->console = 1;
+ port->port.console = 1;
mutex_unlock(&serial->disc_mutex);
return retval;