patch-2_6_7-vs1_9_1_12

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

diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c
index 0195b64..7e9e30e 100644 (file)
--- a/sound/oss/ad1848.c
+++ b/sound/oss/ad1848.c
@@ -624,6 +624,7 @@ static void ad1848_mixer_reset(ad1848_info * devc)
                        devc->supported_devices = MODE3_MIXER_DEVICES;
                        break;
                case MD_4232:
+               case MD_4235:
                case MD_4236:
                        devc->supported_devices = MODE3_MIXER_DEVICES;
                        break;
@@ -672,14 +673,14 @@ static void ad1848_mixer_reset(ad1848_info * devc)
        spin_unlock_irqrestore(&devc->lock,flags);
 }
 
-static int ad1848_mixer_ioctl(int dev, unsigned int cmd, caddr_t arg)
+static int ad1848_mixer_ioctl(int dev, unsigned int cmd, void __user *arg)
 {
        ad1848_info *devc = mixer_devs[dev]->devc;
        int val;
 
        if (cmd == SOUND_MIXER_PRIVATE1) 
        {
-               if (get_user(val, (int *)arg))
+               if (get_user(val, (int __user *)arg))
                        return -EFAULT;
 
                if (val != 0xffff) 
@@ -697,11 +698,11 @@ static int ad1848_mixer_ioctl(int dev, unsigned int cmd, caddr_t arg)
                        spin_unlock_irqrestore(&devc->lock,flags);
                }
                val = devc->mixer_output_port;
-               return put_user(val, (int *)arg);
+               return put_user(val, (int __user *)arg);
        }
        if (cmd == SOUND_MIXER_PRIVATE2)
        {
-               if (get_user(val, (int *)arg))
+               if (get_user(val, (int __user *)arg))
                        return -EFAULT;
                return(ad1848_control(AD1848_MIXER_REROUTE, val));
        }
@@ -712,18 +713,18 @@ static int ad1848_mixer_ioctl(int dev, unsigned int cmd, caddr_t arg)
                        switch (cmd & 0xff) 
                        {
                                case SOUND_MIXER_RECSRC:
-                                       if (get_user(val, (int *)arg))
+                                       if (get_user(val, (int __user *)arg))
                                                return -EFAULT;
                                        val = ad1848_set_recmask(devc, val);
                                        break;
                                
                                default:
-                                       if (get_user(val, (int *)arg))
+                                       if (get_user(val, (int __user *)arg))
                                        return -EFAULT;
                                        val = ad1848_mixer_set(devc, cmd & 0xff, val);
                                        break;
                        } 
-                       return put_user(val, (int *)arg);
+                       return put_user(val, (int __user *)arg);
                }
                else
                {
@@ -759,7 +760,7 @@ static int ad1848_mixer_ioctl(int dev, unsigned int cmd, caddr_t arg)
                                        val = ad1848_mixer_get(devc, cmd & 0xff);
                                        break;
                        }
-                       return put_user(val, (int *)arg);
+                       return put_user(val, (int __user *)arg);
                }
        }
        else