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
/
via82cxxx_audio.c
diff --git
a/sound/oss/via82cxxx_audio.c
b/sound/oss/via82cxxx_audio.c
index
2c83d03
..
dc1c256
100644
(file)
--- a/
sound/oss/via82cxxx_audio.c
+++ b/
sound/oss/via82cxxx_audio.c
@@
-10,7
+10,7
@@
* NO WARRANTY
*
* For a list of known bugs (errata) and documentation,
* NO WARRANTY
*
* For a list of known bugs (errata) and documentation,
- * see via-audio.pdf in
linux/
Documentation/DocBook.
+ * see via-audio.pdf in Documentation/DocBook.
* If this documentation does not exist, run "make pdfdocs".
*/
* If this documentation does not exist, run "make pdfdocs".
*/
@@
-1580,7
+1580,7
@@
match:
file->private_data = card->ac97;
DPRINTK ("EXIT, returning 0\n");
file->private_data = card->ac97;
DPRINTK ("EXIT, returning 0\n");
- return
0
;
+ return
nonseekable_open(inode, file)
;
}
static int via_mixer_ioctl (struct inode *inode, struct file *file, unsigned int cmd,
}
static int via_mixer_ioctl (struct inode *inode, struct file *file, unsigned int cmd,
@@
-2401,11
+2401,6
@@
static ssize_t via_dsp_read(struct file *file, char __user *buffer, size_t count
card = file->private_data;
assert (card != NULL);
card = file->private_data;
assert (card != NULL);
- if (ppos != &file->f_pos) {
- DPRINTK ("EXIT, returning -ESPIPE\n");
- return -ESPIPE;
- }
-
rc = via_syscall_down (card, nonblock);
if (rc) goto out;
rc = via_syscall_down (card, nonblock);
if (rc) goto out;
@@
-2589,11
+2584,6
@@
static ssize_t via_dsp_write(struct file *file, const char __user *buffer, size_
card = file->private_data;
assert (card != NULL);
card = file->private_data;
assert (card != NULL);
- if (ppos != &file->f_pos) {
- DPRINTK ("EXIT, returning -ESPIPE\n");
- return -ESPIPE;
- }
-
rc = via_syscall_down (card, nonblock);
if (rc) goto out;
rc = via_syscall_down (card, nonblock);
if (rc) goto out;
@@
-3345,7
+3335,7
@@
match:
}
DPRINTK ("EXIT, returning 0\n");
}
DPRINTK ("EXIT, returning 0\n");
- return
0
;
+ return
nonseekable_open(inode, file)
;
}
}