patch-2.1.57 linux/drivers/sbus/audio/audio.c

• Lines: 36
• Date: Sat Sep 20 14:51:54 1997
• Orig file: v2.1.56/linux/drivers/sbus/audio/audio.c
• Orig date: Mon Apr 14 16:28:13 1997

diff -u --recursive --new-file v2.1.56/linux/drivers/sbus/audio/audio.c linux/drivers/sbus/audio/audio.c
@@ -183,7 +183,7 @@
 		/* Check to make sure that an output buffer is available. */
 		if (driver->output_count == driver->num_output_buffers) {
 			interruptible_sleep_on(&driver->output_write_wait);
-			if (current->signal & ~current->blocked)
+			if (signal_pending(current))
 				return bytes_written > 0 ? bytes_written : -EINTR;
 		}
 
@@ -226,7 +226,7 @@
 	case AUDIO_DRAIN:
 		if (driver->output_count > 0) {
 			interruptible_sleep_on(&driver->output_drain_wait);
-			retval = (current->signal & ~current->blocked) ? -EINTR : 0;
+			retval = signal_pending(current) ? -EINTR : 0;
 		}
 		break;
 
@@ -270,7 +270,7 @@
 			return -EBUSY;
 
 		interruptible_sleep_on(&driver->open_wait);
-		if (current->signal & ~current->blocked)
+		if (signal_pending(current))
 			return -EINTR;
 		goto retry_open;
 	}
@@ -279,7 +279,7 @@
 			return -EBUSY;
 
 		interruptible_sleep_on(&driver->open_wait);
-		if (current->signal & ~current->blocked)
+		if (signal_pending(current))
 			return -EINTR;
 		goto retry_open;
 	}