patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / sound / core / seq / oss / seq_oss_ioctl.c

diff --git a/sound/core/seq/oss/seq_oss_ioctl.c b/sound/core/seq/oss/seq_oss_ioctl.c
index d5973a8..6d783cd 100644 (file)
--- a/sound/core/seq/oss/seq_oss_ioctl.c
+++ b/sound/core/seq/oss/seq_oss_ioctl.c
@@ -36,6 +36,7 @@ snd_seq_oss_ioctl(seq_oss_devinfo_t *dp, unsigned int cmd, unsigned long carg)
        struct midi_info minf;
        unsigned char ev[8];
        void __user *arg = (void __user *)carg;
+       int __user *p = arg;
        snd_seq_event_t tmpev;
 
        switch (cmd) {
@@ -72,7 +73,7 @@ snd_seq_oss_ioctl(seq_oss_devinfo_t *dp, unsigned int cmd, unsigned long carg)
 
        case SNDCTL_SEQ_TESTMIDI:
                debug_printk(("test midi\n"));
-               if (get_user(dev, (int *)arg))
+               if (get_user(dev, p))
                        return -EFAULT;
                return snd_seq_oss_midi_open(dp, dev, dp->file_mode);
 
@@ -80,42 +81,42 @@ snd_seq_oss_ioctl(seq_oss_devinfo_t *dp, unsigned int cmd, unsigned long carg)
                debug_printk(("get in count\n"));
                if (dp->readq == NULL || ! is_read_mode(dp->file_mode))
                        return 0;
-               return put_user(dp->readq->qlen, (int *)arg) ? -EFAULT : 0;
+               return put_user(dp->readq->qlen, p) ? -EFAULT : 0;
 
        case SNDCTL_SEQ_GETOUTCOUNT:
                debug_printk(("get out count\n"));
                if (! is_write_mode(dp->file_mode) || dp->writeq == NULL)
                        return 0;
-               return put_user(snd_seq_oss_writeq_get_free_size(dp->writeq), (int *)arg) ? -EFAULT : 0;
+               return put_user(snd_seq_oss_writeq_get_free_size(dp->writeq), p) ? -EFAULT : 0;
 
        case SNDCTL_SEQ_GETTIME:
                debug_printk(("get time\n"));
-               return put_user(snd_seq_oss_timer_cur_tick(dp->timer), (int *)arg) ? -EFAULT : 0;
+               return put_user(snd_seq_oss_timer_cur_tick(dp->timer), p) ? -EFAULT : 0;
 
        case SNDCTL_SEQ_RESETSAMPLES:
                debug_printk(("reset samples\n"));
-               if (get_user(dev, (int *)arg))
+               if (get_user(dev, p))
                        return -EFAULT;
                return snd_seq_oss_synth_ioctl(dp, dev, cmd, carg);
 
        case SNDCTL_SEQ_NRSYNTHS:
                debug_printk(("nr synths\n"));
-               return put_user(dp->max_synthdev, (int *)arg) ? -EFAULT : 0;
+               return put_user(dp->max_synthdev, p) ? -EFAULT : 0;
 
        case SNDCTL_SEQ_NRMIDIS:
                debug_printk(("nr midis\n"));
-               return put_user(dp->max_mididev, (int *)arg) ? -EFAULT : 0;
+               return put_user(dp->max_mididev, p) ? -EFAULT : 0;
 
        case SNDCTL_SYNTH_MEMAVL:
                debug_printk(("mem avail\n"));
-               if (get_user(dev, (int *)arg))
+               if (get_user(dev, p))
                        return -EFAULT;
                val = snd_seq_oss_synth_ioctl(dp, dev, cmd, carg);
-               return put_user(val, (int *)arg) ? -EFAULT : 0;
+               return put_user(val, p) ? -EFAULT : 0;
 
        case SNDCTL_FM_4OP_ENABLE:
                debug_printk(("4op\n"));
-               if (get_user(dev, (int *)arg))
+               if (get_user(dev, p))
                        return -EFAULT;
                snd_seq_oss_synth_ioctl(dp, dev, cmd, carg);
                return 0;
@@ -157,7 +158,7 @@ snd_seq_oss_ioctl(seq_oss_devinfo_t *dp, unsigned int cmd, unsigned long carg)
                debug_printk(("threshold\n"));
                if (! is_write_mode(dp->file_mode))
                        return 0;
-               if (get_user(val, (int *)arg))
+               if (get_user(val, p))
                        return -EFAULT;
                if (val < 1)
                        val = 1;
@@ -170,14 +171,14 @@ snd_seq_oss_ioctl(seq_oss_devinfo_t *dp, unsigned int cmd, unsigned long carg)
                debug_printk(("pretime\n"));
                if (dp->readq == NULL || !is_read_mode(dp->file_mode))
                        return 0;
-               if (get_user(val, (int *)arg))
+               if (get_user(val, p))
                        return -EFAULT;
                if (val <= 0)
                        val = -1;
                else
                        val = (HZ * val) / 10;
                dp->readq->pre_event_timeout = val;
-               return put_user(val, (int *)arg) ? -EFAULT : 0;
+               return put_user(val, p) ? -EFAULT : 0;
 
        default:
                debug_printk(("others\n"));