Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 157197
b: refs/heads/master
c: ac89a91
h: refs/heads/master
i:
  157195: 48ac2c0
v: v3
  • Loading branch information
Linus Torvalds committed Sep 5, 2009
1 parent 198a39e commit d84f84c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 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: 37f81fa1f63ad38e16125526bb2769ae0ea8d332
refs/heads/master: ac89a9174decf343de049a06fad75681f71890eb
10 changes: 1 addition & 9 deletions trunk/drivers/char/pty.c
Original file line number Diff line number Diff line change
Expand Up @@ -109,21 +109,13 @@ static int pty_space(struct tty_struct *to)
* the other side of the pty/tty pair.
*/

static int pty_write(struct tty_struct *tty, const unsigned char *buf,
int count)
static int pty_write(struct tty_struct *tty, const unsigned char *buf, int c)
{
struct tty_struct *to = tty->link;
int c;

if (tty->stopped)
return 0;

/* This isn't locked but our 8K is quite sloppy so no
big deal */

c = pty_space(to);
if (c > count)
c = count;
if (c > 0) {
/* Stuff the data into the input queue of the other end */
c = tty_insert_flip_string(to, buf, c);
Expand Down

0 comments on commit d84f84c

Please sign in to comment.