patch-2_6_7-vs1_9_1_12

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

diff --git a/sound/oss/vidc.c b/sound/oss/vidc.c
index 86ad13c..00fe5ce 100644 (file)
--- a/sound/oss/vidc.c
+++ b/sound/oss/vidc.c
@@ -116,7 +116,7 @@ vidc_mixer_set(int mdev, unsigned int level)
 #undef SCALE
 }
 
-static int vidc_mixer_ioctl(int dev, unsigned int cmd, caddr_t arg)
+static int vidc_mixer_ioctl(int dev, unsigned int cmd, void __user *arg)
 {
        unsigned int val;
        unsigned int mdev;
@@ -127,7 +127,7 @@ static int vidc_mixer_ioctl(int dev, unsigned int cmd, caddr_t arg)
        mdev = _SIOC_NR(cmd);
 
        if (_SIOC_DIR(cmd) & _SIOC_WRITE) {
-               if (get_user(val, (unsigned int *)arg))
+               if (get_user(val, (unsigned int __user *)arg))
                        return -EFAULT;
 
                if (mdev < SOUND_MIXER_NRDEVICES)
@@ -167,7 +167,7 @@ static int vidc_mixer_ioctl(int dev, unsigned int cmd, caddr_t arg)
                        return -EINVAL;
        }
 
-       return put_user(val, (unsigned int *)arg) ? -EFAULT : 0;
+       return put_user(val, (unsigned int __user *)arg) ? -EFAULT : 0;
 }
 
 static unsigned int vidc_audio_set_format(int dev, unsigned int fmt)