1 files changed, 5 insertions, 10 deletions

diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c
index 20932cc9c8f7..b09023b07169 100644
--- a/drivers/tty/n_tty.c
+++ b/drivers/tty/n_tty.c
@@ -343,8 +343,7 @@ static void n_tty_packet_mode_flush(struct tty_struct *tty)
                 spin_lock_irqsave(&tty->ctrl_lock, flags);
                 tty->ctrl_status |= TIOCPKT_FLUSHREAD;
                 spin_unlock_irqrestore(&tty->ctrl_lock, flags);
-                if (waitqueue_active(&tty->link->read_wait))
-                        wake_up_interruptible(&tty->link->read_wait);
+                wake_up_interruptible(&tty->link->read_wait);
         }
 }
 
@@ -1382,8 +1381,7 @@ handle_newline:
                         put_tty_queue(c, ldata);
                         smp_store_release(&ldata->canon_head, ldata->read_head);
                         kill_fasync(&tty->fasync, SIGIO, POLL_IN);
-                        if (waitqueue_active(&tty->read_wait))
-                                wake_up_interruptible_poll(&tty->read_wait, POLLIN);
+                        wake_up_interruptible_poll(&tty->read_wait, POLLIN);
                         return 0;
                 }
         }
@@ -1667,8 +1665,7 @@ static void __receive_buf(struct tty_struct *tty, const unsigned char *cp,
 
         if ((read_cnt(ldata) >= ldata->minimum_to_wake) || L_EXTPROC(tty)) {
                 kill_fasync(&tty->fasync, SIGIO, POLL_IN);
-                if (waitqueue_active(&tty->read_wait))
-                        wake_up_interruptible_poll(&tty->read_wait, POLLIN);
+                wake_up_interruptible_poll(&tty->read_wait, POLLIN);
         }
 }
 
@@ -1887,10 +1884,8 @@ static void n_tty_set_termios(struct tty_struct *tty, struct ktermios *old)
         }
 
         /* The termios change make the tty ready for I/O */
-        if (waitqueue_active(&tty->write_wait))
-                wake_up_interruptible(&tty->write_wait);
-        if (waitqueue_active(&tty->read_wait))
-                wake_up_interruptible(&tty->read_wait);
+        wake_up_interruptible(&tty->write_wait);
+        wake_up_interruptible(&tty->read_wait);
 }
 
 /**