patch-2.1.82 linux/drivers/sound/audio.c

• Lines: 31
• Date: Sun Jan 25 10:05:47 1998
• Orig file: v2.1.81/linux/drivers/sound/audio.c
• Orig date: Fri Jan 23 18:10:32 1998

diff -u --recursive --new-file v2.1.81/linux/drivers/sound/audio.c linux/drivers/sound/audio.c
@@ -350,7 +350,7 @@
 int audio_ioctl(int dev, struct fileinfo *file_must_not_be_used,
 		unsigned int cmd, caddr_t arg)
 {
-	int val = 0, info, count;
+	int val, count;
 	unsigned long flags;
 	struct dma_buffparms *dmap;
 
@@ -419,16 +419,16 @@
 			return 0;
 
 		case SNDCTL_DSP_GETCAPS:
-				info = 1 | DSP_CAP_MMAP;	/* Revision level of this ioctl() */
+				val = 1 | DSP_CAP_MMAP;	/* Revision level of this ioctl() */
 				if (audio_devs[dev]->flags & DMA_DUPLEX &&
 					audio_devs[dev]->open_mode == OPEN_READWRITE)
-					info |= DSP_CAP_DUPLEX;
+					val |= DSP_CAP_DUPLEX;
 				if (audio_devs[dev]->coproc)
-					info |= DSP_CAP_COPROC;
+					val |= DSP_CAP_COPROC;
 				if (audio_devs[dev]->d->local_qlen)	/* Device has hidden buffers */
-					info |= DSP_CAP_BATCH;
+					val |= DSP_CAP_BATCH;
 				if (audio_devs[dev]->d->trigger)	/* Supports SETTRIGGER */
-					info |= DSP_CAP_TRIGGER;
+					val |= DSP_CAP_TRIGGER;
 				break;
 			
 		case SOUND_PCM_WRITE_RATE: