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

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

diff -u --recursive --new-file v2.1.77/linux/drivers/sound/ics2101.c linux/drivers/sound/ics2101.c
@@ -118,11 +118,12 @@
 
 static int ics2101_mixer_ioctl(int dev, unsigned int cmd, caddr_t arg)
 {
+	int val;
+	
 	if (((cmd >> 8) & 0xff) == 'M') {
 		if (_SIOC_DIR(cmd) & _SIOC_WRITE) {
-			int val;
 			
-			if (__get_user(val, (int *)arg))
+			if (get_user(val, (int *)arg))
 				return -EFAULT;
 			switch (cmd & 0xff) {
 			case SOUND_MIXER_RECSRC:
@@ -151,7 +152,7 @@
 			default:
 				return -EINVAL;
 			}
-			return __put_user(val, (int *)arg);
+			return put_user(val, (int *)arg);
 		} else {
 			switch (cmd & 0xff) {
 				/*
@@ -199,7 +200,7 @@
 			default:
 				return -EINVAL;
 			}
-			return __put_user(val, (int *)arg);
+			return put_user(val, (int *)arg);
 		}
 	}
 	return -EINVAL;
@@ -220,7 +221,6 @@
 
 	if ((n = sound_alloc_mixerdev()) != -1)
 	{
-		n = num_mixers;
 		mixer_devs[n] = &ics2101_mixer_operations;
 
 		/*