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
/
isa
/
gus
/
gus_mem_proc.c
diff --git
a/sound/isa/gus/gus_mem_proc.c
b/sound/isa/gus/gus_mem_proc.c
index
95071a0
..
6ee2d76
100644
(file)
--- a/
sound/isa/gus/gus_mem_proc.c
+++ b/
sound/isa/gus/gus_mem_proc.c
@@
-33,7
+33,8
@@
typedef struct gus_proc_private {
} gus_proc_private_t;
static long snd_gf1_mem_proc_dump(snd_info_entry_t *entry, void *file_private_data,
} gus_proc_private_t;
static long snd_gf1_mem_proc_dump(snd_info_entry_t *entry, void *file_private_data,
- struct file *file, char __user *buf, long count)
+ struct file *file, char __user *buf,
+ unsigned long count, unsigned long pos)
{
long size;
gus_proc_private_t *priv = snd_magic_cast(gus_proc_private_t, entry->private_data, return -ENXIO);
{
long size;
gus_proc_private_t *priv = snd_magic_cast(gus_proc_private_t, entry->private_data, return -ENXIO);
@@
-41,12
+42,11
@@
static long snd_gf1_mem_proc_dump(snd_info_entry_t *entry, void *file_private_da
int err;
size = count;
int err;
size = count;
- if (
file->f_
pos + size > priv->size)
- size = (long)priv->size -
file->f_
pos;
+ if (pos + size > priv->size)
+ size = (long)priv->size - pos;
if (size > 0) {
if (size > 0) {
- if ((err = snd_gus_dram_read(gus, buf,
file->f_
pos, size, priv->rom)) < 0)
+ if ((err = snd_gus_dram_read(gus, buf, pos, size, priv->rom)) < 0)
return err;
return err;
- file->f_pos += size;
return size;
}
return 0;
return size;
}
return 0;