Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 208563
b: refs/heads/master
c: 4457d98
h: refs/heads/master
i:
  208561: 1a2dc1f
  208559: 2bc7c68
v: v3
  • Loading branch information
Stefani Seibold authored and Linus Torvalds committed Aug 11, 2010
1 parent b7b6d80 commit 6933f76
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 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: ad9c7ed0685406fe3cd7f0749b82bf433a39dd9c
refs/heads/master: 4457d9845927b3c62b6e833be243d21d6ca7df47
3 changes: 1 addition & 2 deletions trunk/drivers/char/nozomi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 6933f76

Please sign in to comment.