From: Uwe Kleine-König Date: Tue, 18 Jul 2017 10:59:40 +0000 (+0200) Subject: serial: fsl_lpuart: clear unsupported options in .rs485_config() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=68c338eaa0bf3e399a1b96ac35d909f0b475208f;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git serial: fsl_lpuart: clear unsupported options in .rs485_config() The struct serial_rs485 parameter is both input and output and is supposed to hold the actually used configuration on return. So clear unsupported settings. Signed-off-by: Uwe Kleine-König Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c index 5b4721bd70f0..d24270fe3cbe 100644 --- a/drivers/tty/serial/fsl_lpuart.c +++ b/drivers/tty/serial/fsl_lpuart.c @@ -1076,6 +1076,11 @@ static int lpuart_config_rs485(struct uart_port *port, ~(UARTMODEM_TXRTSPOL | UARTMODEM_TXRTSE); writeb(modem, sport->port.membase + UARTMODEM); + /* clear unsupported configurations */ + rs485->delay_rts_before_send = 0; + rs485->delay_rts_after_send = 0; + rs485->flags &= ~SER_RS485_RX_DURING_TX; + if (rs485->flags & SER_RS485_ENABLED) { /* Enable auto RS-485 RTS mode */ modem |= UARTMODEM_TXRTSE;