From 07e0ca6a62482d022cf573fb2e615b66a3ec9767 Mon Sep 17 00:00:00 2001 From: Pat Gefre Date: Sat, 11 Mar 2006 03:27:17 -0800 Subject: [PATCH] --- yaml --- r: 20974 b: refs/heads/master c: 27d162e26a873883937b64526445877bd3341d23 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/serial/ioc4_serial.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0e151653daec..27bfc5dc1d28 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 341c2d806b71cc3596afeb2d9bd26cd718e75202 +refs/heads/master: 27d162e26a873883937b64526445877bd3341d23 diff --git a/trunk/drivers/serial/ioc4_serial.c b/trunk/drivers/serial/ioc4_serial.c index f3763d2ccb86..a37579ce6d76 100644 --- a/trunk/drivers/serial/ioc4_serial.c +++ b/trunk/drivers/serial/ioc4_serial.c @@ -2301,7 +2301,6 @@ static void receive_chars(struct uart_port *the_port) int read_count, request_count = IOC4_MAX_CHARS; struct uart_icount *icount; struct uart_info *info = the_port->info; - int flip = 0; unsigned long pflags; /* Make sure all the pointers are "good" ones */ @@ -2313,7 +2312,7 @@ static void receive_chars(struct uart_port *the_port) spin_lock_irqsave(&the_port->lock, pflags); tty = info->tty; - request_count = tty_buffer_request_room(tty, IOC4_MAX_CHARS - 2); + request_count = tty_buffer_request_room(tty, IOC4_MAX_CHARS); if (request_count > 0) { icount = &the_port->icount; @@ -2326,8 +2325,7 @@ static void receive_chars(struct uart_port *the_port) spin_unlock_irqrestore(&the_port->lock, pflags); - if (flip) - tty_flip_buffer_push(tty); + tty_flip_buffer_push(tty); } /**