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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
sound
/
oss
/
ics2101.c
diff --git
a/sound/oss/ics2101.c
b/sound/oss/ics2101.c
index
5c633dd
..
d5f3be8
100644
(file)
--- a/
sound/oss/ics2101.c
+++ b/
sound/oss/ics2101.c
@@
-117,14
+117,14
@@
static int set_volumes(int dev, int vol)
return vol;
}
return vol;
}
-static int ics2101_mixer_ioctl(int dev, unsigned int cmd,
caddr_t
arg)
+static int ics2101_mixer_ioctl(int dev, unsigned int cmd,
void __user *
arg)
{
int val;
if (((cmd >> 8) & 0xff) == 'M') {
if (_SIOC_DIR(cmd) & _SIOC_WRITE) {
{
int val;
if (((cmd >> 8) & 0xff) == 'M') {
if (_SIOC_DIR(cmd) & _SIOC_WRITE) {
- if (get_user(val, (int *)arg))
+ if (get_user(val, (int
__user
*)arg))
return -EFAULT;
switch (cmd & 0xff) {
case SOUND_MIXER_RECSRC:
return -EFAULT;
switch (cmd & 0xff) {
case SOUND_MIXER_RECSRC:
@@
-153,7
+153,7
@@
static int ics2101_mixer_ioctl(int dev, unsigned int cmd, caddr_t arg)
default:
return -EINVAL;
}
default:
return -EINVAL;
}
- return put_user(val, (int *)arg);
+ return put_user(val, (int
__user
*)arg);
} else {
switch (cmd & 0xff) {
/*
} else {
switch (cmd & 0xff) {
/*
@@
-201,7
+201,7
@@
static int ics2101_mixer_ioctl(int dev, unsigned int cmd, caddr_t arg)
default:
return -EINVAL;
}
default:
return -EINVAL;
}
- return put_user(val, (int *)arg);
+ return put_user(val, (int
__user
*)arg);
}
}
return -EINVAL;
}
}
return -EINVAL;