Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27d162e2 authored by Pat Gefre's avatar Pat Gefre Committed by Linus Torvalds
Browse files

[PATCH] Altix: small ioc4 oversight 



Get rid of the local 'flip' variable and no need to 'trim' the buffer.

Signed-off-by: default avatarPatrick Gefre <pfg@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 341c2d80

drivers/serial/ioc4_serial.c

+2 −4
Original line number Diff line number Diff line
@@ -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,7 +2325,6 @@ static void receive_chars(struct uart_port *the_port) 


	spin_unlock_irqrestore(&the_port->lock, pflags);



	if (flip)

	tty_flip_buffer_push(tty);

}