Commit 604fdb75 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman

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: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 9636b755
...@@ -884,7 +884,6 @@ serial_hsu_set_termios(struct uart_port *port, struct ktermios *termios, ...@@ -884,7 +884,6 @@ serial_hsu_set_termios(struct uart_port *port, struct ktermios *termios,
{ {
struct uart_hsu_port *up = struct uart_hsu_port *up =
container_of(port, struct uart_hsu_port, port); container_of(port, struct uart_hsu_port, port);
struct tty_struct *tty = port->state->port.tty;
unsigned char cval, fcr = 0; unsigned char cval, fcr = 0;
unsigned long flags; unsigned long flags;
unsigned int baud, quot; unsigned int baud, quot;
...@@ -907,8 +906,7 @@ serial_hsu_set_termios(struct uart_port *port, struct ktermios *termios, ...@@ -907,8 +906,7 @@ serial_hsu_set_termios(struct uart_port *port, struct ktermios *termios,
} }
/* CMSPAR isn't supported by this driver */ /* CMSPAR isn't supported by this driver */
if (tty) termios->c_cflag &= ~CMSPAR;
tty->termios->c_cflag &= ~CMSPAR;
if (termios->c_cflag & CSTOPB) if (termios->c_cflag & CSTOPB)
cval |= UART_LCR_STOP; cval |= UART_LCR_STOP;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment