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
Merge to Fedora kernel-2.6.7-1.492
[linux-2.6.git]
/
sound
/
core
/
info.c
diff --git
a/sound/core/info.c
b/sound/core/info.c
index
fadd471
..
0b08203
100644
(file)
--- a/
sound/core/info.c
+++ b/
sound/core/info.c
@@
-174,7
+174,7
@@
out:
return ret;
}
return ret;
}
-static ssize_t snd_info_entry_read(struct file *file, char *buffer,
+static ssize_t snd_info_entry_read(struct file *file, char
__user
*buffer,
size_t count, loff_t * offset)
{
snd_info_private_data_t *data;
size_t count, loff_t * offset)
{
snd_info_private_data_t *data;
@@
-208,7
+208,7
@@
static ssize_t snd_info_entry_read(struct file *file, char *buffer,
return size;
}
return size;
}
-static ssize_t snd_info_entry_write(struct file *file, const char *buffer,
+static ssize_t snd_info_entry_write(struct file *file, const char
__user
*buffer,
size_t count, loff_t * offset)
{
snd_info_private_data_t *data;
size_t count, loff_t * offset)
{
snd_info_private_data_t *data;