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
/
pci
/
cs4281.c
diff --git
a/sound/pci/cs4281.c
b/sound/pci/cs4281.c
index
86430a0
..
91a6041
100644
(file)
--- a/
sound/pci/cs4281.c
+++ b/
sound/pci/cs4281.c
@@
-1185,35
+1185,35
@@
static void snd_cs4281_proc_read(snd_info_entry_t *entry,
}
static long snd_cs4281_BA0_read(snd_info_entry_t *entry, void *file_private_data,
}
static long snd_cs4281_BA0_read(snd_info_entry_t *entry, void *file_private_data,
- struct file *file, char __user *buf,
- unsigned long count, unsigned long pos)
+ struct file *file, char __user *buf, long count)
{
long size;
cs4281_t *chip = snd_magic_cast(cs4281_t, entry->private_data, return -ENXIO);
size = count;
{
long size;
cs4281_t *chip = snd_magic_cast(cs4281_t, entry->private_data, return -ENXIO);
size = count;
- if (pos + size > CS4281_BA0_SIZE)
- size = (long)CS4281_BA0_SIZE - pos;
+ if (
file->f_
pos + size > CS4281_BA0_SIZE)
+ size = (long)CS4281_BA0_SIZE -
file->f_
pos;
if (size > 0) {
if (size > 0) {
- if (copy_to_user_fromio(buf, chip->ba0 + pos, size))
+ if (copy_to_user_fromio(buf, chip->ba0 +
file->f_
pos, size))
return -EFAULT;
return -EFAULT;
+ file->f_pos += size;
}
return size;
}
static long snd_cs4281_BA1_read(snd_info_entry_t *entry, void *file_private_data,
}
return size;
}
static long snd_cs4281_BA1_read(snd_info_entry_t *entry, void *file_private_data,
- struct file *file, char __user *buf,
- unsigned long count, unsigned long pos)
+ struct file *file, char __user *buf, long count)
{
long size;
cs4281_t *chip = snd_magic_cast(cs4281_t, entry->private_data, return -ENXIO);
size = count;
{
long size;
cs4281_t *chip = snd_magic_cast(cs4281_t, entry->private_data, return -ENXIO);
size = count;
- if (pos + size > CS4281_BA1_SIZE)
- size = (long)CS4281_BA1_SIZE - pos;
+ if (
file->f_
pos + size > CS4281_BA1_SIZE)
+ size = (long)CS4281_BA1_SIZE -
file->f_
pos;
if (size > 0) {
if (size > 0) {
- if (copy_to_user_fromio(buf, chip->ba1 + pos, size))
+ if (copy_to_user_fromio(buf, chip->ba1 +
file->f_
pos, size))
return -EFAULT;
return -EFAULT;
+ file->f_pos += size;
}
return size;
}
}
return size;
}