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
/
oss
/
cmpci.c
diff --git
a/sound/oss/cmpci.c
b/sound/oss/cmpci.c
index
386107f
..
c0da38b
100644
(file)
--- a/
sound/oss/cmpci.c
+++ b/
sound/oss/cmpci.c
@@
-1852,7
+1852,7
@@
static int cm_open_mixdev(struct inode *inode, struct file *file)
}
VALIDATE_STATE(s);
file->private_data = s;
}
VALIDATE_STATE(s);
file->private_data = s;
- return
nonseekable_open(inode, file)
;
+ return
0
;
}
static int cm_release_mixdev(struct inode *inode, struct file *file)
}
static int cm_release_mixdev(struct inode *inode, struct file *file)
@@
-1926,6
+1926,8
@@
static ssize_t cm_read(struct file *file, char __user *buffer, size_t count, lof
int cnt;
VALIDATE_STATE(s);
int cnt;
VALIDATE_STATE(s);
+ if (ppos != &file->f_pos)
+ return -ESPIPE;
if (s->dma_adc.mapped)
return -ENXIO;
if (!s->dma_adc.ready && (ret = prog_dmabuf(s, 1)))
if (s->dma_adc.mapped)
return -ENXIO;
if (!s->dma_adc.ready && (ret = prog_dmabuf(s, 1)))
@@
-2026,6
+2028,8
@@
static ssize_t cm_write(struct file *file, const char __user *buffer, size_t cou
int cnt;
VALIDATE_STATE(s);
int cnt;
VALIDATE_STATE(s);
+ if (ppos != &file->f_pos)
+ return -ESPIPE;
if (s->dma_dac.mapped)
return -ENXIO;
if (!s->dma_dac.ready && (ret = prog_dmabuf(s, 0)))
if (s->dma_dac.mapped)
return -ENXIO;
if (!s->dma_dac.ready && (ret = prog_dmabuf(s, 0)))
@@
-2874,7
+2878,7
@@
static int cm_open(struct inode *inode, struct file *file)
set_fmt(s, fmtm, fmts);
s->open_mode |= file->f_mode & (FMODE_READ | FMODE_WRITE);
up(&s->open_sem);
set_fmt(s, fmtm, fmts);
s->open_mode |= file->f_mode & (FMODE_READ | FMODE_WRITE);
up(&s->open_sem);
- return
nonseekable_open(inode, file)
;
+ return
0
;
}
static int cm_release(struct inode *inode, struct file *file)
}
static int cm_release(struct inode *inode, struct file *file)