aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2009-09-10 06:20:08 -0400
committerLive-CD User <linux@linux.site>2009-09-19 16:13:38 -0400
commita75b7b68ef73685784781d6d2bc416b6dac20969 (patch)
treef8af24a2c721da8efb3290315555e49c8e50429b /drivers/char
parent502f295f6ca5cd034c69b0662b251ffdeed95d33 (diff)
tty: Char: mxser, use THRE for ASPP_OQUEUE ioctl
In moxa specific ASPP_OQUEUE ioctl command, they apparently want only know whether there is space in transmitter hold register. So switch UART_LSR_TEMT to UART_LSR_THRE in that specific case according to the change in 1.14 moxa drivers. Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/mxser.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
index e218ae29b482..5e28d39b9e81 100644
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
@@ -1806,7 +1806,7 @@ static int mxser_ioctl(struct tty_struct *tty, struct file *file,
1806 1806
1807 lock_kernel(); 1807 lock_kernel();
1808 len = mxser_chars_in_buffer(tty); 1808 len = mxser_chars_in_buffer(tty);
1809 lsr = inb(info->ioaddr + UART_LSR) & UART_LSR_TEMT; 1809 lsr = inb(info->ioaddr + UART_LSR) & UART_LSR_THRE;
1810 len += (lsr ? 0 : 1); 1810 len += (lsr ? 0 : 1);
1811 unlock_kernel(); 1811 unlock_kernel();
1812 1812