diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-08-15 07:43:13 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-08-15 07:43:13 -0400 |
| commit | 824df399a31fe92d88eb8caf86768cc8c7c72a06 (patch) | |
| tree | f966f72be04d1eb53e17b7866c6f49bf2b7d3b93 /drivers/char/pty.c | |
| parent | 8b6120789598d55f6aa2b4e9ac7e70a205d857da (diff) | |
| parent | 48ec45e725aa385d72bced73b267dfaf13351876 (diff) | |
Merge branch 's3c-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux
Diffstat (limited to 'drivers/char/pty.c')
| -rw-r--r-- | drivers/char/pty.c | 2 |
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, | |||
| 144 | 144 | ||
| 145 | static int pty_write_room(struct tty_struct *tty) | 145 | static int pty_write_room(struct tty_struct *tty) |
| 146 | { | 146 | { |
| 147 | if (tty->stopped) | ||
| 148 | return 0; | ||
| 147 | return pty_space(tty->link); | 149 | return pty_space(tty->link); |
| 148 | } | 150 | } |
| 149 | 151 | ||