Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 20974
b: refs/heads/master
c: 27d162e
h: refs/heads/master
v: v3
  • Loading branch information
Pat Gefre authored and Linus Torvalds committed Mar 11, 2006
1 parent 0010938 commit 07e0ca6
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 341c2d806b71cc3596afeb2d9bd26cd718e75202
refs/heads/master: 27d162e26a873883937b64526445877bd3341d23
6 changes: 2 additions & 4 deletions trunk/drivers/serial/ioc4_serial.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand All @@ -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;
Expand All @@ -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);
}

/**
Expand Down

0 comments on commit 07e0ca6

Please sign in to comment.