From 09a3a64a19f08f5b5f552dcfceab617583803bb7 Mon Sep 17 00:00:00 2001 From: Peter Hurley Date: Mon, 11 Mar 2013 16:44:31 -0400 Subject: [PATCH] --- yaml --- r: 364259 b: refs/heads/master c: 25518c68b334aa977d857dd71dd53f694ffb11e8 h: refs/heads/master i: 364257: 759c25cd0806f6487b5d66057c32280e37bce0e4 364255: 86fe476a520aefc94cd988846f2a4dd92c539298 v: v3 --- [refs] | 2 +- trunk/drivers/tty/n_tty.c | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 49cecd5791fb..1d8f4c92c2e3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 977066e7587b1b57023a048c0ba754955ea3e7bc +refs/heads/master: 25518c68b334aa977d857dd71dd53f694ffb11e8 diff --git a/trunk/drivers/tty/n_tty.c b/trunk/drivers/tty/n_tty.c index 15f7195f4b4c..0d3f715de7d2 100644 --- a/trunk/drivers/tty/n_tty.c +++ b/trunk/drivers/tty/n_tty.c @@ -198,9 +198,8 @@ static void put_tty_queue(unsigned char c, struct n_tty_data *ldata) * reset_buffer_flags - reset buffer state * @tty: terminal to reset * - * Reset the read buffer counters, clear the flags, - * and make sure the driver is unthrottled. Called - * from n_tty_open() and n_tty_flush_buffer(). + * Reset the read buffer counters and clear the flags. + * Called from n_tty_open() and n_tty_flush_buffer(). * * Locking: tty_read_lock for read fields. */ @@ -239,17 +238,15 @@ static void n_tty_packet_mode_flush(struct tty_struct *tty) * n_tty_flush_buffer - clean input queue * @tty: terminal device * - * Flush the input buffer. Called when the line discipline is - * being closed, when the tty layer wants the buffer flushed (eg - * at hangup) or when the N_TTY line discipline internally has to - * clean the pending queue (for example some signals). + * Flush the input buffer. Called when the tty layer wants the + * buffer flushed (eg at hangup) or when the N_TTY line discipline + * internally has to clean the pending queue (for example some signals). * * Locking: ctrl_lock, read_lock. */ static void n_tty_flush_buffer(struct tty_struct *tty) { - /* clear everything and unthrottle the driver */ reset_buffer_flags(tty); if (tty->link)