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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
um
/
drivers
/
hostaudio_kern.c
diff --git
a/arch/um/drivers/hostaudio_kern.c
b/arch/um/drivers/hostaudio_kern.c
index
37232f9
..
59602b8
100644
(file)
--- a/
arch/um/drivers/hostaudio_kern.c
+++ b/
arch/um/drivers/hostaudio_kern.c
@@
-67,8
+67,8
@@
MODULE_PARM_DESC(mixer, MIXER_HELP);
/* /dev/dsp file operations */
/* /dev/dsp file operations */
-static ssize_t hostaudio_read(struct file *file, char
__user *buffer,
-
size_t count,
loff_t *ppos)
+static ssize_t hostaudio_read(struct file *file, char
*buffer, size_t count,
+ loff_t *ppos)
{
struct hostaudio_state *state = file->private_data;
void *kbuf;
{
struct hostaudio_state *state = file->private_data;
void *kbuf;
@@
-94,7
+94,7
@@
static ssize_t hostaudio_read(struct file *file, char __user *buffer,
return(err);
}
return(err);
}
-static ssize_t hostaudio_write(struct file *file, const char
__user *buffer,
+static ssize_t hostaudio_write(struct file *file, const char
*buffer,
size_t count, loff_t *ppos)
{
struct hostaudio_state *state = file->private_data;
size_t count, loff_t *ppos)
{
struct hostaudio_state *state = file->private_data;
@@
-152,7
+152,7
@@
static int hostaudio_ioctl(struct inode *inode, struct file *file,
case SNDCTL_DSP_CHANNELS:
case SNDCTL_DSP_SUBDIVIDE:
case SNDCTL_DSP_SETFRAGMENT:
case SNDCTL_DSP_CHANNELS:
case SNDCTL_DSP_SUBDIVIDE:
case SNDCTL_DSP_SETFRAGMENT:
- if(get_user(data, (int
__user
*) arg))
+ if(get_user(data, (int *) arg))
return(-EFAULT);
break;
default:
return(-EFAULT);
break;
default:
@@
-168,7
+168,7
@@
static int hostaudio_ioctl(struct inode *inode, struct file *file,
case SNDCTL_DSP_CHANNELS:
case SNDCTL_DSP_SUBDIVIDE:
case SNDCTL_DSP_SETFRAGMENT:
case SNDCTL_DSP_CHANNELS:
case SNDCTL_DSP_SUBDIVIDE:
case SNDCTL_DSP_SETFRAGMENT:
- if(put_user(data, (int
__user
*) arg))
+ if(put_user(data, (int *) arg))
return(-EFAULT);
break;
default:
return(-EFAULT);
break;
default: