Эх сурвалжийг харах

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>
Alan Cox 13 жил өмнө
parent
commit
604fdb7509

+ 1 - 3
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 =
 	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,
 	}
 	}
 
 
 	/* CMSPAR isn't supported by this driver */
 	/* CMSPAR isn't supported by this driver */
-	if (tty)
-		tty->termios->c_cflag &= ~CMSPAR;
+	termios->c_cflag &= ~CMSPAR;
 
 
 	if (termios->c_cflag & CSTOPB)
 	if (termios->c_cflag & CSTOPB)
 		cval |= UART_LCR_STOP;
 		cval |= UART_LCR_STOP;