summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Brown <doug@schmorgal.com>2024-06-06 21:56:31 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2024-06-24 16:14:33 +0200
commitc5603e2a621dac10c5e21cc430848ebcfa6c7e01 (patch)
treee71b62b85142b2c606ed1388b558898363770d23
parentserial: imx: set receiver level before starting uart (diff)
downloadlinux-c5603e2a621dac10c5e21cc430848ebcfa6c7e01.tar.xz
linux-c5603e2a621dac10c5e21cc430848ebcfa6c7e01.zip
Revert "serial: core: only stop transmit when HW fifo is empty"
This reverts commit 7bfb915a597a301abb892f620fe5c283a9fdbd77. This commit broke pxa and omap-serial, because it inhibited them from calling stop_tx() if their TX FIFOs weren't completely empty. This resulted in these two drivers hanging during transmits because the TX interrupt would stay enabled, and a new TX interrupt would never fire. Cc: stable@vger.kernel.org Fixes: 7bfb915a597a ("serial: core: only stop transmit when HW fifo is empty") Signed-off-by: Doug Brown <doug@schmorgal.com> Link: https://lore.kernel.org/r/20240606195632.173255-2-doug@schmorgal.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--include/linux/serial_core.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 8cb65f50e830..3fb9a29e025f 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -811,8 +811,7 @@ enum UART_TX_FLAGS {
if (pending < WAKEUP_CHARS) { \
uart_write_wakeup(__port); \
\
- if (!((flags) & UART_TX_NOSTOP) && pending == 0 && \
- __port->ops->tx_empty(__port)) \
+ if (!((flags) & UART_TX_NOSTOP) && pending == 0) \
__port->ops->stop_tx(__port); \
} \
\