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
/
oss
/
emu10k1
/
audio.c
diff --git
a/sound/oss/emu10k1/audio.c
b/sound/oss/emu10k1/audio.c
index
1aac365
..
9cf30ab
100644
(file)
--- a/
sound/oss/emu10k1/audio.c
+++ b/
sound/oss/emu10k1/audio.c
@@
-59,9
+59,6
@@
static ssize_t emu10k1_audio_read(struct file *file, char __user *buffer, size_t
DPD(3, "emu10k1_audio_read(), buffer=%p, count=%d\n", buffer, (u32) count);
DPD(3, "emu10k1_audio_read(), buffer=%p, count=%d\n", buffer, (u32) count);
- if (ppos != &file->f_pos)
- return -ESPIPE;
-
if (!access_ok(VERIFY_WRITE, buffer, count))
return -EFAULT;
if (!access_ok(VERIFY_WRITE, buffer, count))
return -EFAULT;
@@
-146,9
+143,6
@@
static ssize_t emu10k1_audio_write(struct file *file, const char __user *buffer,
DPD(3, "emu10k1_audio_write(), buffer=%p, count=%d\n", buffer, (u32) count);
DPD(3, "emu10k1_audio_write(), buffer=%p, count=%d\n", buffer, (u32) count);
- if (ppos != &file->f_pos)
- return -ESPIPE;
-
if (!access_ok(VERIFY_READ, buffer, count))
return -EFAULT;
if (!access_ok(VERIFY_READ, buffer, count))
return -EFAULT;
@@
-1249,7
+1243,7
@@
match:
file->private_data = (void *) wave_dev;
file->private_data = (void *) wave_dev;
- return
0
;
+ return
nonseekable_open(inode, file)
;
}
static int emu10k1_audio_release(struct inode *inode, struct file *file)
}
static int emu10k1_audio_release(struct inode *inode, struct file *file)