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
/
gus_wave.c
diff --git
a/sound/oss/gus_wave.c
b/sound/oss/gus_wave.c
index
1aadc7e
..
35ade6b
100644
(file)
--- a/
sound/oss/gus_wave.c
+++ b/
sound/oss/gus_wave.c
@@
-1045,7
+1045,7
@@
int __init gus_wave_detect(int baseaddr)
return 1;
}
return 1;
}
-static int guswave_ioctl(int dev, unsigned int cmd,
caddr_t
arg)
+static int guswave_ioctl(int dev, unsigned int cmd,
void __user *
arg)
{
switch (cmd)
{
switch (cmd)
@@
-1622,7
+1622,7
@@
static void guswave_close(int dev)
DMAbuf_close_dma(gus_devnum);
}
DMAbuf_close_dma(gus_devnum);
}
-static int guswave_load_patch(int dev, int format, const char *addr,
+static int guswave_load_patch(int dev, int format, const char
__user
*addr,
int offs, int count, int pmgr_flag)
{
struct patch_info patch;
int offs, int count, int pmgr_flag)
{
struct patch_info patch;
@@
-1780,7
+1780,7
@@
static int guswave_load_patch(int dev, int format, const char *addr,
for (i = 0; i < blk_sz; i++)
{
for (i = 0; i < blk_sz; i++)
{
- get_user(*(unsigned char *) &data, (unsigned char *) &((addr)[sizeof_patch + i]));
+ get_user(*(unsigned char *) &data, (unsigned char
__user
*) &((addr)[sizeof_patch + i]));
if (patch.mode & WAVE_UNSIGNED)
if (!(patch.mode & WAVE_16_BITS) || (i & 0x01))
data ^= 0x80; /* Convert to signed */
if (patch.mode & WAVE_UNSIGNED)
if (!(patch.mode & WAVE_16_BITS) || (i & 0x01))
data ^= 0x80; /* Convert to signed */
@@
-2082,14
+2082,14
@@
static int gus_audio_set_bits(int bits)
return bits;
}
return bits;
}
-static int gus_audio_ioctl(int dev, unsigned int cmd,
caddr_t
arg)
+static int gus_audio_ioctl(int dev, unsigned int cmd,
void __user *
arg)
{
int val;
switch (cmd)
{
case SOUND_PCM_WRITE_RATE:
{
int val;
switch (cmd)
{
case SOUND_PCM_WRITE_RATE:
- if (get_user(val, (int *)arg))
+ if (get_user(val, (int
__user
*)arg))
return -EFAULT;
val = gus_audio_set_speed(val);
break;
return -EFAULT;
val = gus_audio_set_speed(val);
break;
@@
-2099,13
+2099,13
@@
static int gus_audio_ioctl(int dev, unsigned int cmd, caddr_t arg)
break;
case SNDCTL_DSP_STEREO:
break;
case SNDCTL_DSP_STEREO:
- if (get_user(val, (int *)arg))
+ if (get_user(val, (int
__user
*)arg))
return -EFAULT;
val = gus_audio_set_channels(val + 1) - 1;
break;
case SOUND_PCM_WRITE_CHANNELS:
return -EFAULT;
val = gus_audio_set_channels(val + 1) - 1;
break;
case SOUND_PCM_WRITE_CHANNELS:
- if (get_user(val, (int *)arg))
+ if (get_user(val, (int
__user
*)arg))
return -EFAULT;
val = gus_audio_set_channels(val);
break;
return -EFAULT;
val = gus_audio_set_channels(val);
break;
@@
-2115,7
+2115,7
@@
static int gus_audio_ioctl(int dev, unsigned int cmd, caddr_t arg)
break;
case SNDCTL_DSP_SETFMT:
break;
case SNDCTL_DSP_SETFMT:
- if (get_user(val, (int *)arg))
+ if (get_user(val, (int
__user
*)arg))
return -EFAULT;
val = gus_audio_set_bits(val);
break;
return -EFAULT;
val = gus_audio_set_bits(val);
break;
@@
-2131,7
+2131,7
@@
static int gus_audio_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);
}
static void gus_audio_reset(int dev)
}
static void gus_audio_reset(int dev)
@@
-2687,19
+2687,19
@@
static void set_input_volumes(void)
#define MIX_DEVS (SOUND_MASK_MIC|SOUND_MASK_LINE| \
SOUND_MASK_SYNTH|SOUND_MASK_PCM)
#define MIX_DEVS (SOUND_MASK_MIC|SOUND_MASK_LINE| \
SOUND_MASK_SYNTH|SOUND_MASK_PCM)
-int gus_default_mixer_ioctl(int dev, unsigned int cmd,
caddr_t
arg)
+int gus_default_mixer_ioctl(int dev, unsigned int cmd,
void __user *
arg)
{
int vol, val;
if (((cmd >> 8) & 0xff) != 'M')
return -EINVAL;
{
int vol, val;
if (((cmd >> 8) & 0xff) != 'M')
return -EINVAL;
- if (!access_ok(VERIFY_WRITE,
(int *)
arg, sizeof(int)))
+ if (!access_ok(VERIFY_WRITE, arg, sizeof(int)))
return -EFAULT;
if (_SIOC_DIR(cmd) & _SIOC_WRITE)
{
return -EFAULT;
if (_SIOC_DIR(cmd) & _SIOC_WRITE)
{
- if (__get_user(val, (int *) arg))
+ if (__get_user(val, (int
__user
*) arg))
return -EFAULT;
switch (cmd & 0xff)
return -EFAULT;
switch (cmd & 0xff)
@@
-2810,7
+2810,7
@@
int gus_default_mixer_ioctl(int dev, unsigned int cmd, caddr_t arg)
return -EINVAL;
}
}
return -EINVAL;
}
}
- return __put_user(val, (int *)arg);
+ return __put_user(val, (int
__user
*)arg);
}
static struct mixer_operations gus_mixer_operations =
}
static struct mixer_operations gus_mixer_operations =