From 6933f769cb25ea8ba1bc49ccb1288487de4479c7 Mon Sep 17 00:00:00 2001 From: Stefani Seibold Date: Tue, 10 Aug 2010 18:03:37 -0700 Subject: [PATCH] --- yaml --- r: 208563 b: refs/heads/master c: 4457d9845927b3c62b6e833be243d21d6ca7df47 h: refs/heads/master i: 208561: 1a2dc1fd40852a9f0ababa9ad17747f2f963af70 208559: 2bc7c68b246ce8f7374c1ff97e670ff9de41127f v: v3 --- [refs] | 2 +- trunk/drivers/char/nozomi.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 990839feff12..2a60bdae02f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad9c7ed0685406fe3cd7f0749b82bf433a39dd9c +refs/heads/master: 4457d9845927b3c62b6e833be243d21d6ca7df47 diff --git a/trunk/drivers/char/nozomi.c b/trunk/drivers/char/nozomi.c index 18af923093c3..817169cbb245 100644 --- a/trunk/drivers/char/nozomi.c +++ b/trunk/drivers/char/nozomi.c @@ -1743,8 +1743,7 @@ static int ntty_write_room(struct tty_struct *tty) if (dc) { mutex_lock(&port->tty_sem); if (port->port.count) - room = port->fifo_ul.size - - kfifo_len(&port->fifo_ul); + room = kfifo_avail(&port->fifo_ul); mutex_unlock(&port->tty_sem); } return room;