aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/serial/sh-sci.c
diff options
context:
space:
mode:
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>2009-12-01 09:54:46 +0000
committerPaul Mundt <lethal@linux-sh.org>2009-12-04 13:42:23 +0900
commitb1516803d5274386256bef4972dfbf8c9eed5165 (patch)
tree1626874e3dbf9e4715097ca23f2a650c8a789254 /drivers/serial/sh-sci.c
parentfd2cb0ce74e07babaf8c7bf96ef03c25d194e463 (diff)
downloadkernel_samsung_tuna-b1516803d5274386256bef4972dfbf8c9eed5165.zip
kernel_samsung_tuna-b1516803d5274386256bef4972dfbf8c9eed5165.tar.gz
kernel_samsung_tuna-b1516803d5274386256bef4972dfbf8c9eed5165.tar.bz2
serial: sh-sci: Fix too early port disabling.
Currently serial ports on SH CPUs get disabled too early, because the sci_tx_empty() routine claims to not be able to detect whether the transmission has been completed and just always returns TIOCSER_TEMT. This results in corrupt output of last characters if the port is not open for reading at the same time. It is however possible to detect whether transmission has been completed. Use the TEND bit of the status register for this. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/serial/sh-sci.c')
-rw-r--r--drivers/serial/sh-sci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index 972fca0..ff38dbd 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -799,8 +799,8 @@ static void sci_free_irq(struct sci_port *port)
static unsigned int sci_tx_empty(struct uart_port *port)
{
- /* Can't detect */
- return TIOCSER_TEMT;
+ unsigned short status = sci_in(port, SCxSR);
+ return status & SCxSR_TEND(port) ? TIOCSER_TEMT : 0;
}
static void sci_set_mctrl(struct uart_port *port, unsigned int mctrl)