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

• Lines: 54
• Date: Mon Dec 1 09:45:01 1997
• Orig file: v2.1.68/linux/drivers/sound/dmabuf.c
• Orig date: Mon Dec 1 12:04:13 1997

diff -u --recursive --new-file v2.1.68/linux/drivers/sound/dmabuf.c linux/drivers/sound/dmabuf.c
@@ -269,7 +269,7 @@
 	audio_devs[dev]->dmap_out->flags |= DMA_SYNCING;
 
 	audio_devs[dev]->dmap_out->underrun_count = 0;
-	if (!(current->signal & ~current->blocked)
+	if (!signal_pending(current)
 	    && audio_devs[dev]->dmap_out->qlen
 	    && audio_devs[dev]->dmap_out->underrun_count == 0)
 	  {
@@ -408,7 +408,7 @@
 		  audio_devs[dev]->dmap_out->flags |= DMA_SYNCING;
 
 		  audio_devs[dev]->dmap_out->underrun_count = 0;
-		  while (!(current->signal & ~current->blocked)
+		  while (!signal_pending(current)
 			 && n++ <= audio_devs[dev]->dmap_out->nbufs
 			 && audio_devs[dev]->dmap_out->qlen
 		       && audio_devs[dev]->dmap_out->underrun_count == 0)
@@ -448,7 +448,7 @@
 		  cli();
 		  if (audio_devs[dev]->d->local_qlen)	/* Device has hidden buffers */
 		    {
-			    while (!((current->signal & ~current->blocked))
+			    while (!signal_pending(current)
 				   && audio_devs[dev]->d->local_qlen(dev))
 			      {
 
@@ -488,7 +488,7 @@
 
 	if (audio_devs[dev]->open_mode & OPEN_WRITE)
 		if (!(audio_devs[dev]->dmap_in->mapping_flags & DMA_MAP_MAPPED))
-			if (!((current->signal & ~current->blocked))
+			if (!signal_pending(current)
 			    && (audio_devs[dev]->dmap_out->dma_mode == DMODE_OUTPUT))
 			  {
 				  DMAbuf_sync(dev);
@@ -835,7 +835,7 @@
 			  tmout = 20 * HZ;
 	  }
 
-	if ((current->signal & ~current->blocked))
+	if (signal_pending(current))
 		return -EIO;
 
 
@@ -860,7 +860,7 @@
 		  printk("Sound: DMA (output) timed out - IRQ/DRQ config error?\n");
 		  ;
 		  dma_reset_output(dev);
-	} else if ((current->signal & ~current->blocked))
+	} else if (signal_pending(current))
 	  {
 		  err = -EINTR;
 	  }