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
/
cmpci.c
diff --git
a/sound/oss/cmpci.c
b/sound/oss/cmpci.c
index
a7d067c
..
386107f
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
0
;
+ return
nonseekable_open(inode, file)
;
}
static int cm_release_mixdev(struct inode *inode, struct file *file)
}
static int cm_release_mixdev(struct inode *inode, struct file *file)
@@
-1926,8
+1926,6
@@
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)))
@@
-2028,8
+2026,6
@@
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)))
@@
-2878,7
+2874,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
0
;
+ return
nonseekable_open(inode, file)
;
}
static int cm_release(struct inode *inode, struct file *file)
}
static int cm_release(struct inode *inode, struct file *file)
@@
-3280,7
+3276,7
@@
MODULE_AUTHOR("ChenLi Tien, cltien@cmedia.com.tw");
MODULE_DESCRIPTION("CM8x38 Audio Driver");
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("CM8x38 Audio Driver");
MODULE_LICENSE("GPL");
-static void __dev
in
it cm_remove(struct pci_dev *dev)
+static void __dev
ex
it cm_remove(struct pci_dev *dev)
{
struct cm_state *s = pci_get_drvdata(dev);
{
struct cm_state *s = pci_get_drvdata(dev);
@@
-3337,7
+3333,7
@@
static struct pci_driver cm_driver = {
.name = "cmpci",
.id_table = id_table,
.probe = cm_probe,
.name = "cmpci",
.id_table = id_table,
.probe = cm_probe,
- .remove =
cm_remove
+ .remove =
__devexit_p(cm_remove)
};
static int __init init_cmpci(void)
};
static int __init init_cmpci(void)