Merge tag 'v3.10.76' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / tty / tty_buffer.c

diff --git a/drivers/tty/tty_buffer.c b/drivers/tty/tty_buffer.c
index 9121c1f7aeefef4b029501b114a5799f3195ca15..a42a028a9d4e6b65d1e169f1199e495a098d1964 100644 (file)
--- a/drivers/tty/tty_buffer.c
+++ b/drivers/tty/tty_buffer.c
@@ -429,7 +429,7 @@ static void flush_to_ldisc(struct work_struct *work)
                return;
 
        disc = tty_ldisc_ref(tty);
-       if (disc == NULL)       /*  !TTY_LDISC */
+       if (disc == NULL)
                return;
 
        spin_lock_irqsave(&buf->lock, flags);