fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/sound/oss/vidc.c b/sound/oss/vidc.c
index 86ad13c..bb4a096 100644 (file)
--- a/sound/oss/vidc.c
+++ b/sound/oss/vidc.c
@@ -17,7 +17,6 @@
  * We currently support a mixer device, but it is currently non-functional.
  */
 
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
@@ -116,7 +115,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 +126,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 +166,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)
@@ -373,7 +372,7 @@ static void vidc_audio_trigger(int dev, int enable_bits)
                        adev->flags |= DMA_ACTIVE;
 
                        dma_interrupt = vidc_audio_dma_interrupt;
-                       vidc_sound_dma_irq(0, NULL, NULL);
+                       vidc_sound_dma_irq(0, NULL);
                        iomd_writeb(DMA_CR_E | 0x10, IOMD_SD0CR);
 
                        local_irq_restore(flags);