diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-19 13:40:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-19 13:40:03 -0700 |
| commit | 8dba8f949492cf2ffb32c1c2fbfe12c3f53b1866 (patch) | |
| tree | eb91a9a4f3ab0f71ca388fd17cb7dd9e03adb9f4 /drivers/usb | |
| parent | 2eb645e7b5662da47646f76b41b4141f2c9bf13a (diff) | |
| parent | 336cee42dd52824e360ab419eab4e8888eb054ec (diff) | |
| download | linux-3.10-8dba8f949492cf2ffb32c1c2fbfe12c3f53b1866.tar.gz linux-3.10-8dba8f949492cf2ffb32c1c2fbfe12c3f53b1866.tar.bz2 linux-3.10-8dba8f949492cf2ffb32c1c2fbfe12c3f53b1866.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6:
tty_port,usb-console: Fix usb serial console open/close regression
tty: cpm_uart: use resource_size()
tty_buffer: Fix distinct type warning
hvc_console: Fix race between hvc_close and hvc_remove
uartlite: Fix build on sparc.
tty: Take a 256 byte padding into account when buffering below sub-page units
Revert "tty: Add a new VT mode which is like VT_PROCESS but doesn't require a VT_RELDISP ioctl call"
Diffstat (limited to 'drivers/usb')
| -rw-r--r-- | drivers/usb/serial/console.c | 1 |
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; |