patch-2.1.57 linux/drivers/cdrom/mcdx.c

Next file: linux/drivers/char/apm_bios.c
Previous file: linux/drivers/cdrom/cdu31a.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.56/linux/drivers/cdrom/mcdx.c linux/drivers/cdrom/mcdx.c
@@ -947,7 +947,7 @@
 		xtrace(SLEEP, "*** delay: sleepq\n");
 		interruptible_sleep_on(&stuff->sleepq);
 		xtrace(SLEEP, "delay awoken\n");
-		if (current->signal & ~current->blocked) {
+		if (signal_pending(current)) {
 			xtrace(SLEEP, "got signal\n");
 		}
 	}
@@ -1410,7 +1410,7 @@
 
 			if (!stuffp->introk) { xtrace(XFER, "error via interrupt\n"); }
 			else if (current->timeout == 0) { xtrace(XFER, "timeout\n"); }
-			else if (current->signal & ~current->blocked) {
+			else if (signal_pending(current)) {
 				xtrace(XFER, "signal\n");
 			} else continue;
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov