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

• Lines: 72
• Date: Thu Feb 26 19:56:57 1998
• Orig file: v2.1.88/linux/drivers/sound/dmabuf.c
• Orig date: Mon Feb 23 18:12:08 1998

diff -u --recursive --new-file v2.1.88/linux/drivers/sound/dmabuf.c linux/drivers/sound/dmabuf.c
@@ -1150,7 +1150,7 @@
 	}
 }
 
-static unsigned int poll_input(int dev, poll_table *wait)
+static unsigned int poll_input(struct file * file, int dev, poll_table *wait)
 {
 	struct audio_operations *adev = audio_devs[dev];
 	struct dma_buffparms *dmap = adev->dmap_in;
@@ -1158,7 +1158,7 @@
 	if (!(adev->open_mode & OPEN_READ))
 		return 0;
 	if (dmap->mapping_flags & DMA_MAP_MAPPED) {
-		poll_wait(&adev->in_sleeper, wait);
+		poll_wait(file, &adev->in_sleeper, wait);
 		if (dmap->qlen)
 			return POLLIN | POLLRDNORM;
 		return 0;
@@ -1169,7 +1169,7 @@
 		    !dmap->qlen && adev->go) {
 			unsigned long flags;
 			
-			poll_wait(&adev->in_sleeper, wait);
+			poll_wait(file, &adev->in_sleeper, wait);
 			save_flags(flags);
 			cli();
 			DMAbuf_activate_recording(dev, dmap);
@@ -1177,13 +1177,13 @@
 		}
 		return 0;
 	}
-	poll_wait(&adev->in_sleeper, wait);
+	poll_wait(file, &adev->in_sleeper, wait);
 	if (!dmap->qlen)
 		return 0;
 	return POLLIN | POLLRDNORM;
 }
 
-static unsigned int poll_output(int dev, poll_table *wait)
+static unsigned int poll_output(struct file * file, int dev, poll_table *wait)
 {
 	struct audio_operations *adev = audio_devs[dev];
 	struct dma_buffparms *dmap = adev->dmap_out;
@@ -1191,14 +1191,14 @@
 	if (!(adev->open_mode & OPEN_WRITE))
 		return 0;
 	if (dmap->mapping_flags & DMA_MAP_MAPPED) {
-		poll_wait(&adev->out_sleeper, wait);
+		poll_wait(file, &adev->out_sleeper, wait);
 		if (dmap->qlen)
 			return POLLOUT | POLLWRNORM;
 		return 0;
 	}
 	if (dmap->dma_mode == DMODE_INPUT)
 		return 0;
-	poll_wait(&adev->out_sleeper, wait);
+	poll_wait(file, &adev->out_sleeper, wait);
 	if (dmap->dma_mode == DMODE_NONE)
 		return POLLOUT | POLLWRNORM;
 	if (!DMAbuf_space_in_queue(dev))
@@ -1206,9 +1206,9 @@
 	return POLLOUT | POLLWRNORM;
 }
 
-unsigned int DMAbuf_poll(int dev, poll_table *wait)
+unsigned int DMAbuf_poll(struct file * file, int dev, poll_table *wait)
 {
-	return poll_input(dev, wait) | poll_output(dev, wait);
+	return poll_input(file, dev, wait) | poll_output(file, dev, wait);
 }
 
 void DMAbuf_deinit(int dev)