summaryrefslogtreecommitdiffstats
path: root/drivers/block/acsi_slm.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1997-12-06 23:51:34 +0000
committerRalf Baechle <ralf@linux-mips.org>1997-12-06 23:51:34 +0000
commit230e5ab6a084ed50470f101934782dbf54b0d06b (patch)
tree5dd821c8d33f450470588e7a543f74bf74306e9e /drivers/block/acsi_slm.c
parentc9b1c8a64c6444d189856f1e26bdcb8b4cd0113a (diff)
Merge with Linux 2.1.67.
Diffstat (limited to 'drivers/block/acsi_slm.c')
-rw-r--r--drivers/block/acsi_slm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/acsi_slm.c b/drivers/block/acsi_slm.c
index 97957c0ea..64a401140 100644
--- a/drivers/block/acsi_slm.c
+++ b/drivers/block/acsi_slm.c
@@ -634,7 +634,7 @@ static long slm_write( struct inode *node, struct file *file,
while( SLMState == PRINTING ||
(SLMState == FILLING && SLMBufOwner != device) ) {
interruptible_sleep_on( &slm_wait );
- if (current->signal & ~current->blocked)
+ if (signal_pending(current))
return( -ERESTARTSYS );
}
if (SLMState == IDLE) {