From d84f84c56ea0127a9d8e741778d4f917116bbb69 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sat, 5 Sep 2009 13:27:10 -0700 Subject: [PATCH] --- yaml --- r: 157197 b: refs/heads/master c: ac89a9174decf343de049a06fad75681f71890eb h: refs/heads/master i: 157195: 48ac2c03298dd0e9e02dfd0ff1c1abac1c156b3b v: v3 --- [refs] | 2 +- trunk/drivers/char/pty.c | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 0332965f616c..4a4e93c4fb78 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 37f81fa1f63ad38e16125526bb2769ae0ea8d332 +refs/heads/master: ac89a9174decf343de049a06fad75681f71890eb diff --git a/trunk/drivers/char/pty.c b/trunk/drivers/char/pty.c index d083c73d784a..b33d6688e910 100644 --- a/trunk/drivers/char/pty.c +++ b/trunk/drivers/char/pty.c @@ -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);