patch-2.1.57 linux/drivers/char/rocket.c

• Lines: 45
• Date: Sat Sep 20 14:51:54 1997
• Orig file: v2.1.56/linux/drivers/char/rocket.c
• Orig date: Sun Jul 27 12:11:00 1997

diff -u --recursive --new-file v2.1.56/linux/drivers/char/rocket.c linux/drivers/char/rocket.c
@@ -836,7 +836,7 @@
 		    (do_clocal || (sGetChanStatusLo(&info->channel) &
 				   CD_ACT)))
 			break;
-		if (current->signal & ~current->blocked) {
+		if (signal_pending(current)) {
 			retval = -ERESTARTSYS;
 			break;
 		}
@@ -1333,11 +1333,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;
@@ -1346,10 +1346,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 TIOCGSOFTCAR:
@@ -1548,7 +1548,7 @@
 		current->counter = 0;	/* make us low-priority */
 		current->timeout = jiffies + check_time;
 		schedule();
-		if (current->signal & ~current->blocked)
+		if (signal_pending(current))
 			break;
 	}
 	current->state = TASK_RUNNING;