patch-2.1.69 linux/drivers/sound/midibuf.c

Next file: linux/drivers/sound/sequencer.c
Previous file: linux/drivers/sound/midi_synth.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.68/linux/drivers/sound/midibuf.c linux/drivers/sound/midibuf.c
@@ -93,7 +93,7 @@
 	 */
 
 	if (midi_devs[dev]->buffer_status != NULL)
-		while (!(current->signal & ~current->blocked) &&
+		while (!signal_pending(current) &&
 		       midi_devs[dev]->buffer_status(dev))
 
 		  {
@@ -283,7 +283,7 @@
 							   * devices
 							 */
 
-		  while (!(current->signal & ~current->blocked) &&
+		  while (!signal_pending(current) &&
 			 DATA_AVAIL(midi_out_buf[dev]))
 
 		    {
@@ -364,7 +364,7 @@
 				      }
 				    midi_sleep_flag[dev].opts &= ~WK_SLEEP;
 			    };
-			    if ((current->signal & ~current->blocked))
+			    if (signal_pending(current))
 			      {
 				      restore_flags(flags);
 				      return -EINTR;
@@ -421,7 +421,7 @@
 			    }
 			  input_sleep_flag[dev].opts &= ~WK_SLEEP;
 		  };
-		  if ((current->signal & ~current->blocked))
+		  if (signal_pending(current))
 			  c = -EINTR;	/*
 					   * The user is getting restless
 					 */

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