Char: mxser_new, reverse if-else-paths patch
Subsystems (2)
PATCH 2/3 Char: mxser_new, reverse if-else-paths patch
mxser_new, reverse if-else-paths patch
This patch was intorduced in mxser to 1.9.1 conversion, but causes endless sleep in tcdrain userspace call.
Thanks to Sergei Organov <[email protected]> for testing and pointing this out.
Signed-off-by Jiri Slaby <[email protected]>
---
commit 9c1c1abbe9e875e258bb238b74077d002414c950
tree 4a734348f557a63cea50b061d9aa5b3d4d13d06c
parent e48623373bf13133bf9b76e54bc64f3ab5b46517
author Jiri Slaby <[email protected]> Mon, 09 Oct 2006 14:57:03 +0200 committer Jiri Slaby <[email protected]> Mon, 09 Oct 2006 14:57:03 +0200
drivers/char/mxser_new.c | 27 +++++++-------------------- 1 files changed, 7 insertions(+), 20 deletions(-)
drivers/char/mxser_new.c +7 -20
@@ -1218,12 +1218,7 @@ static int mxser_write_room(struct tty_sstatic int mxser_chars_in_buffer (struct tty_struct *tty) {struct mxser_port *info = tty->driver_data; -int len = info->xmit_cnt; - -if (!(inb (info->ioaddr +UART_LSR ) &UART_LSR_THRE )) - len++; - -return len; +return info->xmit_cnt; }static void mxser_flush_buffer (struct tty_struct *tty)
@@ -1953,7 +1948,7 @@ static void mxser_stoprx(struct tty_struif (info->board->chip_flag) { info->IER &= ~MOXA_MUST_RECV_ISR ;outb (info->IER, info->ioaddr +UART_IER ); - }else if (!(info->flags &ASYNC_CLOSING )) { + }else { info->x_char =STOP_CHAR (tty);outb (0 , info->ioaddr +UART_IER ); info->IER |=UART_IER_THRI ;
@@ -1990,7 +1985,7 @@ static void mxser_unthrottle(struct tty_if (info->board->chip_flag) { info->IER |=MOXA_MUST_RECV_ISR ;outb (info->IER, info->ioaddr +UART_IER ); - }else if (!(info->flags &ASYNC_CLOSING )) { + }else { info->x_char =START_CHAR (tty);outb (0 , info->ioaddr +UART_IER ); info->IER |=UART_IER_THRI ;
@@ -2265,10 +2260,8 @@ static void mxser_receive_chars(struct m flag =TTY_OVERRUN ;/* added by casper 1/11/2000 */ port->icount.overrun++; - }else - flags =TTY_BREAK ; - }else - flags =0 ; + } + }tty_insert_flip_char (tty, ch, flag); cnt++;if (cnt >= recv_room) {
@@ -2324,14 +2317,8 @@ static void mxser_transmit_chars(structif (port->xmit_buf ==0 ) goto unlock; -if (port->xmit_cnt ==0 ) { -if (port->xmit_cnt <WAKEUP_CHARS ) {/* XXX what's this for?? */ -set_bit (MXSER_EVENT_TXLOW , &port->event); -schedule_work (&port->tqueue); - } - goto unlock; - } -if (port->tty->stopped || (port->tty->hw_stopped && +if ((port->xmit_cnt <=0 ) || port->tty->stopped || + (port->tty->hw_stopped && (port->type !=PORT_16550A ) && (!port->board->chip_flag))) { port->IER &= ~UART_IER_THRI ;