]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
serial: stm32: fix software flow control transfer
authorValentin Caron <valentin.caron@foss.st.com>
Tue, 11 Jan 2022 16:44:41 +0000 (17:44 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 3 Feb 2022 08:27:52 +0000 (09:27 +0100)
commit 037b91ec7729524107982e36ec4b40f9b174f7a2 upstream.

x_char is ignored by stm32_usart_start_tx() when xmit buffer is empty.

Fix start_tx condition to allow x_char to be sent.

Fixes: 48a6092fb41f ("serial: stm32-usart: Add STM32 USART Driver")
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Erwan Le Ray <erwan.leray@foss.st.com>
Signed-off-by: Valentin Caron <valentin.caron@foss.st.com>
Link: https://lore.kernel.org/r/20220111164441.6178-3-valentin.caron@foss.st.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/stm32-usart.c

index f89d1f79be18fffd199f902d5cc8fa3936d0b815..83d3645ac2ef142da5d7b198cafd19db7dea53c2 100644 (file)
@@ -279,7 +279,7 @@ static void stm32_start_tx(struct uart_port *port)
 {
        struct circ_buf *xmit = &port->state->xmit;
 
-       if (uart_circ_empty(xmit))
+       if (uart_circ_empty(xmit) && !port->x_char)
                return;
 
        stm32_set_bits(port, USART_CR1, USART_CR1_TXEIE | USART_CR1_TE);