patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / sound / oss / ics2101.c

diff --git a/sound/oss/ics2101.c b/sound/oss/ics2101.c
index 5c633dd..d5f3be8 100644 (file)
--- 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;