1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/tty/tty_buffer.c b/drivers/tty/tty_buffer.c
index 91e326ffe7db..8b00f6a34a7d 100644
--- a/drivers/tty/tty_buffer.c
+++ b/drivers/tty/tty_buffer.c
@@ -342,6 +342,8 @@ EXPORT_SYMBOL(tty_insert_flip_string_flags);
  *      Takes any pending buffers and transfers their ownership to the
  *      ldisc side of the queue. It then schedules those characters for
  *      processing by the line discipline.
+ *      Note that this function can only be used when the low_latency flag
+ *      is unset. Otherwise the workqueue won't be flushed.
  *
  *      Locking: Takes tty->buf.lock
  */
@@ -514,7 +516,8 @@ static void flush_to_ldisc(struct work_struct *work)
  */
 void tty_flush_to_ldisc(struct tty_struct *tty)
 {
-        flush_work(&tty->buf.work);
+        if (!tty->low_latency)
+                flush_work(&tty->buf.work);
 }
 
 /**