[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <50BF0A56.9050209@ilyx.ru>
Date: Wed, 05 Dec 2012 12:48:22 +0400
From: Ilya Zykov <ilya@...x.ru>
To: Greg Kroah-Hartman <gregkh@...uxfoundation.org>
CC: Alan Cox <alan@...ux.intel.com>, Jiri Slaby <jslaby@...e.cz>,
linux-kernel@...r.kernel.org, linux-serial@...r.kernel.org
Subject: [PATCH -next 2/2] tty: Correct tty buffer flush.
tty: Correct tty buffer flush.
Signed-off-by: Ilya Zykov <ilya@...x.ru>
---
drivers/tty/tty_buffer.c | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/tty_buffer.c b/drivers/tty/tty_buffer.c
index 7602df8..8a3333d 100644
--- a/drivers/tty/tty_buffer.c
+++ b/drivers/tty/tty_buffer.c
@@ -119,11 +119,14 @@ static void __tty_buffer_flush(struct tty_port *port)
struct tty_bufhead *buf = &port->buf;
struct tty_buffer *thead;
- while ((thead = buf->head) != NULL) {
- buf->head = thead->next;
- tty_buffer_free(port, thead);
+ if (unlikely(buf->head == NULL))
+ return;
+ while ((thead = buf->head->next) != NULL) {
+ tty_buffer_free(port, buf->head);
+ buf->head = thead;
}
- buf->tail = NULL;
+ WARN_ON(buf->head != buf->tail);
+ buf->head->read = buf->head->commit;
}
/**
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists