summaryrefslogtreecommitdiffstats
path: root/drivers/serial/ioc3_serial.c
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2010-02-17 14:07:13 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-02 23:43:22 +0100
commit4165fe4ef7305609a96c7f248cefb9c414d0ede5 (patch)
tree3e239b821a4b5365c7e15996d44fbf4726cd7840 /drivers/serial/ioc3_serial.c
parenttty: Fix the ldisc hangup race (diff)
downloadlinux-4165fe4ef7305609a96c7f248cefb9c414d0ede5.tar.xz
linux-4165fe4ef7305609a96c7f248cefb9c414d0ede5.zip
tty: Fix up char drivers request_room usage
We can't change them all but quite a few misuse it. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/serial/ioc3_serial.c')
-rw-r--r--drivers/serial/ioc3_serial.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/serial/ioc3_serial.c b/drivers/serial/ioc3_serial.c
index 85dc0410ac1a..23ba6b40b3ac 100644
--- a/drivers/serial/ioc3_serial.c
+++ b/drivers/serial/ioc3_serial.c
@@ -1411,8 +1411,7 @@ static int receive_chars(struct uart_port *the_port)
read_count = do_read(the_port, ch, MAX_CHARS);
if (read_count > 0) {
flip = 1;
- read_room = tty_buffer_request_room(tty, read_count);
- tty_insert_flip_string(tty, ch, read_room);
+ read_room = tty_insert_flip_string(tty, ch, read_count);
the_port->icount.rx += read_count;
}
spin_unlock_irqrestore(&the_port->lock, pflags);