patch-2.1.78 linux/drivers/sound/pas2_mixer.c

• Lines: 66
• Date: Mon Jan 5 09:50:22 1998
• Orig file: v2.1.77/linux/drivers/sound/pas2_mixer.c
• Orig date: Fri Jan 2 14:37:02 1998

diff -u --recursive --new-file v2.1.77/linux/drivers/sound/pas2_mixer.c linux/drivers/sound/pas2_mixer.c
@@ -216,11 +216,11 @@
 
 static int pas_mixer_ioctl(int dev, unsigned int cmd, caddr_t arg)
 {
-	int level, v;
+	int level,v ;
 
 	DEB(printk("pas2_mixer.c: int pas_mixer_ioctl(unsigned int cmd = %X, unsigned int arg = %X)\n", cmd, arg));
 	if (cmd == SOUND_MIXER_PRIVATE1) { /* Set loudness bit */
-		if (__get_user(level, (int *)arg))
+		if (get_user(level, (int *)arg))
 			return -EFAULT;
 		if (level == -1)  /* Return current settings */
 			level = (mode_control & 0x04);
@@ -231,10 +231,10 @@
 			set_mode(mode_control);
 		}
 		level = !!level;
-		return __put_user(level, (int *)arg);
+		return put_user(level, (int *)arg);
 	}
 	if (cmd == SOUND_MIXER_PRIVATE2) { /* Set enhance bit */
-		if (__get_user(level, (int *)arg))
+		if (get_user(level, (int *)arg))
 			return -EFAULT;
 		if (level == -1) { /* Return current settings */
 			if (!(mode_control & 0x03))
@@ -254,13 +254,13 @@
 				i = (i + 1) * 20;
 			level = i;
 		}
-		return __put_user(level, (int *)arg);
+		return put_user(level, (int *)arg);
 	}
 	if (cmd == SOUND_MIXER_PRIVATE3) { /* Set mute bit */
-		if (__get_user(level, (int *)arg))
+		if (get_user(level, (int *)arg))
 			return -EFAULT;
 		if (level == -1)	/* Return current settings */
-			level = = !(pas_read(0x0B8A) & 0x20);
+			level = !(pas_read(0x0B8A) & 0x20);
 		else {
 			if (level)
 				pas_write(pas_read(0x0B8A) & (~0x20), 0x0B8A);
@@ -269,10 +269,10 @@
 
 			level = !(pas_read(0x0B8A) & 0x20);
 		}
-		return __put_user(level, (int *)arg);
+		return put_user(level, (int *)arg);
 	}
 	if (((cmd >> 8) & 0xff) == 'M') {
-		if (__get_user(v, (int *)arg))
+		if (get_user(v, (int *)arg))
 			return -EFAULT;
 		if (_SIOC_DIR(cmd) & _SIOC_WRITE) {
 			v = pas_mixer_set(cmd & 0xff, v);
@@ -303,7 +303,7 @@
 				break;
 			}
 		}
-		return __put_user(v, (int *)arg);
+		return put_user(v, (int *)arg);
 	}
 	return -EINVAL;
 }