diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-21 02:55:17 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-21 02:55:17 +0400 |
| commit | e11c675ede0d42a405ae595528bf0b29ce1ae56f (patch) | |
| tree | e0ec481e66e4a4b70289d78992b209639a582c0c /drivers/serial/jsm/jsm_neo.c | |
| parent | 467f9957d9283be40101d7255d06fae7e211ff4c (diff) | |
| parent | 7bd032dc2793afcbaf4a350056768da84cdbd89b (diff) | |
| download | linux-e11c675ede0d42a405ae595528bf0b29ce1ae56f.tar.xz | |
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: (79 commits)
USB serial: update the console driver
usb-serial: straighten out serial_open
usb-serial: add missing tests and debug lines
usb-serial: rename subroutines
usb-serial: fix termios initialization logic
usb-serial: acquire references when a new tty is installed
usb-serial: change logic of serial lookups
usb-serial: put subroutines in logical order
usb-serial: change referencing of port and serial structures
tty: Char: mxser, use THRE for ASPP_OQUEUE ioctl
tty: Char: mxser, add support for CP112UL
uartlite: support shared interrupt lines
tty: USB: serial/mct_u232, fix tty refcnt
tty: riscom8, fix tty refcnt
tty: riscom8, fix shutdown declaration
TTY: fix typos
tty: Power: fix suspend vt regression
tty: vt: use printk_once
tty: handle VT specific compat ioctls in vt driver
n_tty: move echoctl check and clean up logic
...
Diffstat (limited to 'drivers/serial/jsm/jsm_neo.c')
| -rw-r--r-- | drivers/serial/jsm/jsm_neo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/jsm/jsm_neo.c b/drivers/serial/jsm/jsm_neo.c index 9dadaa11d266..b4b124e4828f 100644 --- a/drivers/serial/jsm/jsm_neo.c +++ b/drivers/serial/jsm/jsm_neo.c @@ -989,7 +989,7 @@ static void neo_param(struct jsm_channel *ch) { 50, B50 }, }; - cflag = C_BAUD(ch->uart_port.info->port.tty); + cflag = C_BAUD(ch->uart_port.state->port.tty); baud = 9600; for (i = 0; i < ARRAY_SIZE(baud_rates); i++) { if (baud_rates[i].cflag == cflag) { |