patch-2.1.57 linux/drivers/sbus/char/sunmouse.c

Next file: linux/drivers/sbus/char/zs.c
Previous file: linux/drivers/sbus/char/sunkbd.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.56/linux/drivers/sbus/char/sunmouse.c linux/drivers/sbus/char/sunmouse.c
@@ -367,7 +367,7 @@
 		if (file->f_flags & O_NONBLOCK)
 			return -EWOULDBLOCK;
 		add_wait_queue (&sunmouse.proc_list, &wait);
-		while (queue_empty () && !(current->signal & ~current->blocked)){
+		while (queue_empty () && !signal_pending(current)) {
 			current->state = TASK_INTERRUPTIBLE;
 			schedule ();
 		}
@@ -414,7 +414,7 @@
 		return count-c;
 	}
 	/* Only called if nothing was sent */
-	if (current->signal & ~current->blocked)
+	if (signal_pending(current))
 		return -ERESTARTSYS;
 	return 0;
 }

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