diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-06 23:51:34 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-06 23:51:34 +0000 |
| commit | 230e5ab6a084ed50470f101934782dbf54b0d06b (patch) | |
| tree | 5dd821c8d33f450470588e7a543f74bf74306e9e /drivers/sbus/char/zs.c | |
| parent | c9b1c8a64c6444d189856f1e26bdcb8b4cd0113a (diff) | |
Merge with Linux 2.1.67.
Diffstat (limited to 'drivers/sbus/char/zs.c')
| -rw-r--r-- | drivers/sbus/char/zs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/sbus/char/zs.c b/drivers/sbus/char/zs.c index 3d6759a7c..8875f7dc7 100644 --- a/drivers/sbus/char/zs.c +++ b/drivers/sbus/char/zs.c @@ -1775,7 +1775,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp, !(info->flags & ZILOG_CLOSING) && (do_clocal || (DCD & r0))) break; - if (current->signal & ~current->blocked) { + if (signal_pending(current)) { retval = -ERESTARTSYS; break; } |