mirror of
https://github.com/torvalds/linux.git
synced 2024-11-22 20:22:09 +00:00
[PATCH] Altix: small ioc4 oversight
Get rid of the local 'flip' variable and no need to 'trim' the buffer. Signed-off-by: Patrick Gefre <pfg@sgi.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
parent
341c2d806b
commit
27d162e26a
@ -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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user