Merge tag 'renesas-pinctrl-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / tty / tty_buffer.c

diff --git a/drivers/tty/tty_buffer.c b/drivers/tty/tty_buffer.c
index 578aa7594b11febce9cf50b6f5863bc8a34dfe8c..9121c1f7aeefef4b029501b114a5799f3195ca15 100644 (file)
--- a/drivers/tty/tty_buffer.c
+++ b/drivers/tty/tty_buffer.c
@@ -449,11 +449,6 @@ static void flush_to_ldisc(struct work_struct *work)
                                tty_buffer_free(port, head);
                                continue;
                        }
-                       /* Ldisc or user is trying to flush the buffers
-                          we are feeding to the ldisc, stop feeding the
-                          line discipline as we want to empty the queue */
-                       if (test_bit(TTYP_FLUSHPENDING, &port->iflags))
-                               break;
                        if (!tty->receive_room)
                                break;
                        if (count > tty->receive_room)
@@ -465,17 +460,20 @@ static void flush_to_ldisc(struct work_struct *work)
                        disc->ops->receive_buf(tty, char_buf,
                                                        flag_buf, count);
                        spin_lock_irqsave(&buf->lock, flags);
+                       /* Ldisc or user is trying to flush the buffers.
+                          We may have a deferred request to flush the
+                          input buffer, if so pull the chain under the lock
+                          and empty the queue */
+                       if (test_bit(TTYP_FLUSHPENDING, &port->iflags)) {
+                               __tty_buffer_flush(port);
+                               clear_bit(TTYP_FLUSHPENDING, &port->iflags);
+                               wake_up(&tty->read_wait);
+                               break;
+                       }
                }
                clear_bit(TTYP_FLUSHING, &port->iflags);
        }
 
-       /* We may have a deferred request to flush the input buffer,
-          if so pull the chain under the lock and empty the queue */
-       if (test_bit(TTYP_FLUSHPENDING, &port->iflags)) {
-               __tty_buffer_flush(port);
-               clear_bit(TTYP_FLUSHPENDING, &port->iflags);
-               wake_up(&tty->read_wait);
-       }
        spin_unlock_irqrestore(&buf->lock, flags);
 
        tty_ldisc_deref(disc);