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/char/stallion.c | |
| parent | c9b1c8a64c6444d189856f1e26bdcb8b4cd0113a (diff) | |
Merge with Linux 2.1.67.
Diffstat (limited to 'drivers/char/stallion.c')
| -rw-r--r-- | drivers/char/stallion.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/stallion.c b/drivers/char/stallion.c index 1ec03230b..8e378215f 100644 --- a/drivers/char/stallion.c +++ b/drivers/char/stallion.c @@ -889,7 +889,7 @@ static int stl_waitcarrier(stlport_t *portp, struct file *filp) (doclocal || (portp->sigs & TIOCM_CD))) { break; } - if (current->signal & ~current->blocked) { + if (signal_pending(current)) { rc = -ERESTARTSYS; break; } |