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

• Lines: 26
• Date: Mon Jan 5 09:39:52 1998
• Orig file: v2.1.77/linux/drivers/sound/sb_mixer.c
• Orig date: Fri Jan 2 14:37:02 1998

diff -u --recursive --new-file v2.1.77/linux/drivers/sound/sb_mixer.c linux/drivers/sound/sb_mixer.c
@@ -293,14 +293,14 @@
 	 * Use ioctl(fd, SOUND_MIXER_PRIVATE1, &mode) to turn AGC off (0) or on (1).
 	 */
 	if (cmd == SOUND_MIXER_PRIVATE1 && devc->model == MDL_SB16) {
-		if (__get_user(val, (int *)arg))
+		if (get_user(val, (int *)arg))
 			return -EFAULT;
 		sb_setmixer(devc, 0x43, (~val) & 0x01);
 		return 0;
 	}
 	if (((cmd >> 8) & 0xff) == 'M') {
 		if (_SIOC_DIR(cmd) & _SIOC_WRITE) {
-			if (__get_user(val, (int *)arg))
+			if (get_user(val, (int *)arg))
 				return -EFAULT;
 			switch (cmd & 0xff) {
 			case SOUND_MIXER_RECSRC:
@@ -338,7 +338,7 @@
 				  ret = sb_mixer_get(devc, cmd & 0xff);
 				  break;
 			  }
-		return __put_user(ret, (int *)arg); 
+		return put_user(ret, (int *)arg); 
 	} else
 		return -EINVAL;
 }