X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sound%2Foss%2Fics2101.c;h=d5f3be8550f34e6591c31de9b3e3600d6a6ab78a;hb=d939d46ba7caa14e960be18e18f5c07be8806d7a;hp=5c633dd6a55259e005c29a7febcdeb8d319273b8;hpb=86090fcac5e27b630656fe3d963a6b80e26dac44;p=linux-2.6.git

diff --git a/sound/oss/ics2101.c b/sound/oss/ics2101.c
index 5c633dd6a..d5f3be855 100644
--- a/sound/oss/ics2101.c
+++ b/sound/oss/ics2101.c
@@ -117,14 +117,14 @@ static int set_volumes(int dev, int vol)
 	return vol;
 }
 
-static int ics2101_mixer_ioctl(int dev, unsigned int cmd, caddr_t arg)
+static int ics2101_mixer_ioctl(int dev, unsigned int cmd, void __user *arg)
 {
 	int val;
 	
 	if (((cmd >> 8) & 0xff) == 'M') {
 		if (_SIOC_DIR(cmd) & _SIOC_WRITE) {
 			
-			if (get_user(val, (int *)arg))
+			if (get_user(val, (int __user *)arg))
 				return -EFAULT;
 			switch (cmd & 0xff) {
 			case SOUND_MIXER_RECSRC:
@@ -153,7 +153,7 @@ static int ics2101_mixer_ioctl(int dev, unsigned int cmd, caddr_t arg)
 			default:
 				return -EINVAL;
 			}
-			return put_user(val, (int *)arg);
+			return put_user(val, (int __user *)arg);
 		} else {
 			switch (cmd & 0xff) {
 				/*
@@ -201,7 +201,7 @@ static int ics2101_mixer_ioctl(int dev, unsigned int cmd, caddr_t arg)
 			default:
 				return -EINVAL;
 			}
-			return put_user(val, (int *)arg);
+			return put_user(val, (int __user *)arg);
 		}
 	}
 	return -EINVAL;