summaryrefslogtreecommitdiffstats
path: root/drivers/char/pty.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-08-26 00:40:29 +0200
committerH. Peter Anvin <hpa@zytor.com>2009-08-26 00:40:29 +0200
commite8a2eb47e6ca03d4a4f98f0beef73720c5dddc0c (patch)
tree31c4d7718111abddfaaa8d3fb14ab4a7e2554cd9 /drivers/char/pty.c
parentx86: properly annotate alternatives.c (diff)
parentx86: Fix build with older binutils and consolidate linker script (diff)
downloadlinux-e8a2eb47e6ca03d4a4f98f0beef73720c5dddc0c.tar.xz
linux-e8a2eb47e6ca03d4a4f98f0beef73720c5dddc0c.zip
Merge commit 'origin/x86/urgent' into x86/asm
Diffstat (limited to 'drivers/char/pty.c')
-rw-r--r--drivers/char/pty.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/pty.c b/drivers/char/pty.c
index 6e6942c45f5b..d083c73d784a 100644
--- a/drivers/char/pty.c
+++ b/drivers/char/pty.c
@@ -144,6 +144,8 @@ static int pty_write(struct tty_struct *tty, const unsigned char *buf,
static int pty_write_room(struct tty_struct *tty)
{
+ if (tty->stopped)
+ return 0;
return pty_space(tty->link);
}