Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

[~andy/linux] / drivers / tty / serial / 68328serial.c

diff --git a/drivers/tty/serial/68328serial.c b/drivers/tty/serial/68328serial.c
index 208c411393d89eb658e1365d448262a15dfc4215..5dc9c4bfa66e4686d5360ab33da61eff1109715a 100644 (file)
--- a/drivers/tty/serial/68328serial.c
+++ b/drivers/tty/serial/68328serial.c
@@ -629,8 +629,7 @@ static void rs_flush_chars(struct tty_struct *tty)
        /* Enable transmitter */
        local_irq_save(flags);
 
-       if (info->xmit_cnt <= 0 || tty->stopped || tty->hw_stopped ||
-                       !info->xmit_buf) {
+       if (info->xmit_cnt <= 0 || tty->stopped || !info->xmit_buf) {
                local_irq_restore(flags);
                return;
        }
@@ -696,7 +695,7 @@ static int rs_write(struct tty_struct * tty,
                total += c;
        }
 
-       if (info->xmit_cnt && !tty->stopped && !tty->hw_stopped) {
+       if (info->xmit_cnt && !tty->stopped) {
                /* Enable transmitter */
                local_irq_disable();            
 #ifndef USE_INTS
@@ -977,10 +976,8 @@ static void rs_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
        change_speed(info, tty);
 
        if ((old_termios->c_cflag & CRTSCTS) &&
-           !(tty->termios.c_cflag & CRTSCTS)) {
-               tty->hw_stopped = 0;
+           !(tty->termios.c_cflag & CRTSCTS))
                rs_start(tty);
-       }
        
 }