diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-16 05:34:03 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-16 05:34:03 +0000 |
| commit | 967c65a99059fd459b956c1588ce0ba227912c4e (patch) | |
| tree | 8224d013ff5d255420713d05610c7efebd204d2a /drivers/sgi/char/sgiserial.c | |
| parent | e20c1cc1656a66a2773bca4591a895cbc12696ff (diff) | |
Merge with Linux 2.1.72, part 1.
Diffstat (limited to 'drivers/sgi/char/sgiserial.c')
| -rw-r--r-- | drivers/sgi/char/sgiserial.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/sgi/char/sgiserial.c b/drivers/sgi/char/sgiserial.c index 025f41e69..c8d4d7e54 100644 --- a/drivers/sgi/char/sgiserial.c +++ b/drivers/sgi/char/sgiserial.c @@ -1601,7 +1601,7 @@ static int block_til_ready(struct tty_struct *tty, struct file * filp, if (!(info->flags & ZILOG_CALLOUT_ACTIVE) && !(info->flags & ZILOG_CLOSING) && do_clocal) break; - if (current->signal & ~current->blocked) { + if (signal_pending(current)) { retval = -ERESTARTSYS; break; } |