patch-2.1.57 linux/drivers/sbus/char/sab82532.c
Next file: linux/drivers/sbus/char/sunkbd.c
Previous file: linux/drivers/sbus/char/pcikbd.c
Back to the patch index
Back to the overall index
- Lines: 45
- Date:
Sat Sep 20 14:51:54 1997
- Orig file:
v2.1.56/linux/drivers/sbus/char/sab82532.c
- Orig date:
Thu Sep 4 17:07:31 1997
diff -u --recursive --new-file v2.1.56/linux/drivers/sbus/char/sab82532.c linux/drivers/sbus/char/sab82532.c
@@ -1247,11 +1247,11 @@
if (retval)
return retval;
tty_wait_until_sent(tty, 0);
- if (current->signal & ~current->blocked)
+ if (signal_pending(current))
return -EINTR;
if (!arg) {
send_break(info, HZ/4); /* 1/4 second */
- if (current->signal & ~current->blocked)
+ if (signal_pending(current))
return -EINTR;
}
return 0;
@@ -1260,10 +1260,10 @@
if (retval)
return retval;
tty_wait_until_sent(tty, 0);
- if (current->signal & ~current->blocked)
+ if (signal_pending(current))
return -EINTR;
send_break(info, arg ? arg*(HZ/10) : HZ/4);
- if (current->signal & ~current->blocked)
+ if (signal_pending(current))
return -EINTR;
return 0;
case TIOCSBRK:
@@ -1325,7 +1325,7 @@
while (1) {
interruptible_sleep_on(&info->delta_msr_wait);
/* see if a signal did it */
- if (current->signal & ~current->blocked)
+ if (signal_pending(current))
return -ERESTARTSYS;
cli();
cnow = info->icount; /* atomic copy */
@@ -1699,7 +1699,7 @@
!(info->flags & ASYNC_CLOSING) &&
(do_clocal || !(info->regs->r.vstr & SAB82532_VSTR_CD)))
break;
- if (current->signal & ~current->blocked) {
+ if (signal_pending(current)) {
retval = -ERESTARTSYS;
break;
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov