From 607f4e3864a4306be0d0ad11ff34284c239aad1b Mon Sep 17 00:00:00 2001 From: Paul Fulghum Date: Wed, 11 Jan 2006 17:51:48 -0600 Subject: [PATCH] new tty buffering access fix Fix typos in new tty buffering that incorrectly access and update buffers in pending queue. Signed-off-by: Paul Fulghum Acked-by: Alan Cox Signed-off-by: Linus Torvalds --- drivers/char/tty_io.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c index 1eda82b31a6..eb8b5be4e24 100644 --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c @@ -312,7 +312,7 @@ static struct tty_buffer *tty_buffer_find(struct tty_struct *tty, size_t size) int tty_buffer_request_room(struct tty_struct *tty, size_t size) { - struct tty_buffer *b = tty->buf.head, *n; + struct tty_buffer *b = tty->buf.tail, *n; int left = 0; /* OPTIMISATION: We could keep a per tty "zero" sized buffer to @@ -326,7 +326,6 @@ int tty_buffer_request_room(struct tty_struct *tty, size_t size) n = tty_buffer_find(tty, size); if(n == NULL) return left; - n->next = b; if(b != NULL) b->next = n; else @@ -2751,6 +2750,8 @@ static void flush_to_ldisc(void *private_) spin_lock_irqsave(&tty->read_lock, flags); while((tbuf = tty->buf.head) != NULL) { tty->buf.head = tbuf->next; + if (tty->buf.head == NULL) + tty->buf.tail = NULL; spin_unlock_irqrestore(&tty->read_lock, flags); /* printk("Process buffer %p for %d\n", tbuf, tbuf->used); */ disc->receive_buf(tty, tbuf->char_buf_ptr, @@ -2759,7 +2760,6 @@ static void flush_to_ldisc(void *private_) spin_lock_irqsave(&tty->read_lock, flags); tty_buffer_free(tty, tbuf); } - tty->buf.tail = NULL; spin_unlock_irqrestore(&tty->read_lock, flags); out: tty_ldisc_deref(disc); -- cgit v1.2.3-70-g09d2