From 9c4f9ef6f0bb630c9e210d9c8ac65b67bb805bd2 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Fri, 18 Sep 2009 07:05:58 -0700 Subject: [PATCH] --- yaml --- r: 163050 b: refs/heads/master c: 202c4675c55ddf6b443c7e057d2dff6b42ef71aa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/pty.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b18190a23dff..7ca39b4d7f98 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df58bee21ed218cb7dfb561a590b1bd2a99531cf +refs/heads/master: 202c4675c55ddf6b443c7e057d2dff6b42ef71aa diff --git a/trunk/drivers/char/pty.c b/trunk/drivers/char/pty.c index b33d6688e910..53761cefa915 100644 --- a/trunk/drivers/char/pty.c +++ b/trunk/drivers/char/pty.c @@ -120,8 +120,10 @@ static int pty_write(struct tty_struct *tty, const unsigned char *buf, int c) /* Stuff the data into the input queue of the other end */ c = tty_insert_flip_string(to, buf, c); /* And shovel */ - tty_flip_buffer_push(to); - tty_wakeup(tty); + if (c) { + tty_flip_buffer_push(to); + tty_wakeup(tty); + } } return c; }