diff options
| author | Alan Cox <alan@linux.intel.com> | 2011-11-10 13:17:55 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-15 12:13:42 -0800 |
| commit | 604fdb75094a7367e1794fd0f62183380364ce13 (patch) | |
| tree | bbb8dce258427d4385543e247b67ff595452005f /drivers/tty | |
| parent | 9636b755da7b498094bdf15b4ce9f6fd16995e4e (diff) | |
| download | linux-604fdb75094a7367e1794fd0f62183380364ce13.tar.gz linux-604fdb75094a7367e1794fd0f62183380364ce13.tar.bz2 linux-604fdb75094a7367e1794fd0f62183380364ce13.zip | |
serial,mfd: Fix CMSPAR setup
This is referenced the wrong way. Mika Westerberg added some checks to the
tty to support multiple console, but the real problem is simply referencing the
termios object via the wrong path.
Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/mfd.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/tty/serial/mfd.c b/drivers/tty/serial/mfd.c index 286c386d9c46..e272d3919c67 100644 --- a/drivers/tty/serial/mfd.c +++ b/drivers/tty/serial/mfd.c @@ -884,7 +884,6 @@ serial_hsu_set_termios(struct uart_port *port, struct ktermios *termios, { struct uart_hsu_port *up = container_of(port, struct uart_hsu_port, port); - struct tty_struct *tty = port->state->port.tty; unsigned char cval, fcr = 0; unsigned long flags; unsigned int baud, quot; @@ -907,8 +906,7 @@ serial_hsu_set_termios(struct uart_port *port, struct ktermios *termios, } /* CMSPAR isn't supported by this driver */ - if (tty) - tty->termios->c_cflag &= ~CMSPAR; + termios->c_cflag &= ~CMSPAR; if (termios->c_cflag & CSTOPB) cval |= UART_LCR_STOP; |