git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
sound
/
oss
/
ad1816.c
diff --git
a/sound/oss/ad1816.c
b/sound/oss/ad1816.c
index
258bb4e
..
4425064
100644
(file)
--- a/
sound/oss/ad1816.c
+++ b/
sound/oss/ad1816.c
@@
-874,10
+874,11
@@
ad1816_mixer_reset (ad1816_info * devc)
}
static int
}
static int
-ad1816_mixer_ioctl (int dev, unsigned int cmd,
caddr_t
arg)
+ad1816_mixer_ioctl (int dev, unsigned int cmd,
void __user *
arg)
{
ad1816_info *devc = mixer_devs[dev]->devc;
int val;
{
ad1816_info *devc = mixer_devs[dev]->devc;
int val;
+ int __user *p = arg;
DEBUGNOISE(printk(KERN_DEBUG "ad1816: mixer_ioctl called!\n"));
DEBUGNOISE(printk(KERN_DEBUG "ad1816: mixer_ioctl called!\n"));
@@
-889,19
+890,19
@@
ad1816_mixer_ioctl (int dev, unsigned int cmd, caddr_t arg)
switch (cmd & 0xff){
case SOUND_MIXER_RECSRC:
switch (cmd & 0xff){
case SOUND_MIXER_RECSRC:
- if (get_user(val,
(int *)arg
))
+ if (get_user(val,
p
))
return -EFAULT;
val=ad1816_set_recmask (devc, val);
return -EFAULT;
val=ad1816_set_recmask (devc, val);
- return put_user(val,
(int *)arg
);
+ return put_user(val,
p
);
break;
default:
break;
default:
- if (get_user(val,
(int *)arg
))
+ if (get_user(val,
p
))
return -EFAULT;
if ((val=ad1816_mixer_set (devc, cmd & 0xff, val))<0)
return val;
else
return -EFAULT;
if ((val=ad1816_mixer_set (devc, cmd & 0xff, val))<0)
return val;
else
- return put_user(val,
(int *)arg
);
+ return put_user(val,
p
);
}
} else {
/* read ioctl */
}
} else {
/* read ioctl */
@@
-909,34
+910,34
@@
ad1816_mixer_ioctl (int dev, unsigned int cmd, caddr_t arg)
case SOUND_MIXER_RECSRC:
val=devc->recmask;
case SOUND_MIXER_RECSRC:
val=devc->recmask;
- return put_user(val,
(int *)arg
);
+ return put_user(val,
p
);
break;
case SOUND_MIXER_DEVMASK:
val=devc->supported_devices;
break;
case SOUND_MIXER_DEVMASK:
val=devc->supported_devices;
- return put_user(val,
(int *)arg
);
+ return put_user(val,
p
);
break;
case SOUND_MIXER_STEREODEVS:
val=devc->supported_devices & ~(SOUND_MASK_SPEAKER | SOUND_MASK_IMIX);
break;
case SOUND_MIXER_STEREODEVS:
val=devc->supported_devices & ~(SOUND_MASK_SPEAKER | SOUND_MASK_IMIX);
- return put_user(val,
(int *)arg
);
+ return put_user(val,
p
);
break;
case SOUND_MIXER_RECMASK:
val=devc->supported_rec_devices;
break;
case SOUND_MIXER_RECMASK:
val=devc->supported_rec_devices;
- return put_user(val,
(int *)arg
);
+ return put_user(val,
p
);
break;
case SOUND_MIXER_CAPS:
val=SOUND_CAP_EXCL_INPUT;
break;
case SOUND_MIXER_CAPS:
val=SOUND_CAP_EXCL_INPUT;
- return put_user(val,
(int *)arg
);
+ return put_user(val,
p
);
break;
default:
if ((val=ad1816_mixer_get (devc, cmd & 0xff))<0)
return val;
else
break;
default:
if ((val=ad1816_mixer_get (devc, cmd & 0xff))<0)
return val;
else
- return put_user(val,
(int *)arg
);
+ return put_user(val,
p
);
}
}
} else
}
}
} else
@@
-1234,10
+1235,10
@@
static struct {
} isapnp_ad1816_list[] __initdata = {
{ ISAPNP_ANY_ID, ISAPNP_ANY_ID,
ISAPNP_VENDOR('A','D','S'), ISAPNP_FUNCTION(0x7150),
} isapnp_ad1816_list[] __initdata = {
{ ISAPNP_ANY_ID, ISAPNP_ANY_ID,
ISAPNP_VENDOR('A','D','S'), ISAPNP_FUNCTION(0x7150),
-
0
},
+
NULL
},
{ ISAPNP_ANY_ID, ISAPNP_ANY_ID,
ISAPNP_VENDOR('A','D','S'), ISAPNP_FUNCTION(0x7180),
{ ISAPNP_ANY_ID, ISAPNP_ANY_ID,
ISAPNP_VENDOR('A','D','S'), ISAPNP_FUNCTION(0x7180),
-
0
},
+
NULL
},
{0}
};
{0}
};