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
/
maestro.c
diff --git
a/sound/oss/maestro.c
b/sound/oss/maestro.c
index
4a670f4
..
66456db
100644
(file)
--- a/
sound/oss/maestro.c
+++ b/
sound/oss/maestro.c
@@
-2158,7
+2158,7
@@
static int ess_open_mixdev(struct inode *inode, struct file *file)
if (!card)
return -ENODEV;
file->private_data = card;
if (!card)
return -ENODEV;
file->private_data = card;
- return
0
;
+ return
nonseekable_open(inode, file)
;
}
static int ess_release_mixdev(struct inode *inode, struct file *file)
}
static int ess_release_mixdev(struct inode *inode, struct file *file)
@@
-2274,8
+2274,6
@@
ess_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
unsigned char *combbuf = NULL;
VALIDATE_STATE(s);
unsigned char *combbuf = NULL;
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)))
@@
-2372,8
+2370,6
@@
ess_write(struct file *file, const char __user *buffer, size_t count, loff_t *pp
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)))
@@
-3082,7
+3078,7
@@
ess_open(struct inode *inode, struct file *file)
s->open_mode |= file->f_mode & (FMODE_READ | FMODE_WRITE);
up(&s->open_sem);
s->open_mode |= file->f_mode & (FMODE_READ | FMODE_WRITE);
up(&s->open_sem);
- return
0
;
+ return
nonseekable_open(inode, file)
;
}
static int
}
static int