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
/
ymfpci.c
diff --git
a/sound/oss/ymfpci.c
b/sound/oss/ymfpci.c
index
7b3236f
..
13bcc76
100644
(file)
--- a/
sound/oss/ymfpci.c
+++ b/
sound/oss/ymfpci.c
@@
-1231,8
+1231,6
@@
ymf_read(struct file *file, char __user *buffer, size_t count, loff_t *ppos)
unsigned int swptr;
int cnt; /* This many to go in this revolution */
unsigned int swptr;
int cnt; /* This many to go in this revolution */
- if (ppos != &file->f_pos)
- return -ESPIPE;
if (dmabuf->mapped)
return -ENXIO;
if (!dmabuf->ready && (ret = prog_dmabuf(state, 1)))
if (dmabuf->mapped)
return -ENXIO;
if (!dmabuf->ready && (ret = prog_dmabuf(state, 1)))
@@
-1350,8
+1348,6
@@
ymf_write(struct file *file, const char __user *buffer, size_t count, loff_t *pp
YMFDBGW("ymf_write: count %d\n", count);
YMFDBGW("ymf_write: count %d\n", count);
- if (ppos != &file->f_pos)
- return -ESPIPE;
if (dmabuf->mapped)
return -ENXIO;
if (!dmabuf->ready && (ret = prog_dmabuf(state, 0)))
if (dmabuf->mapped)
return -ENXIO;
if (!dmabuf->ready && (ret = prog_dmabuf(state, 0)))
@@
-1965,7
+1961,7
@@
static int ymf_open(struct inode *inode, struct file *file)
#endif
up(&unit->open_sem);
#endif
up(&unit->open_sem);
- return
0
;
+ return
nonseekable_open(inode, file)
;
out_nodma:
/*
out_nodma:
/*
@@
-2043,7
+2039,7
@@
static int ymf_open_mixdev(struct inode *inode, struct file *file)
match:
file->private_data = unit->ac97_codec[i];
match:
file->private_data = unit->ac97_codec[i];
- return
0
;
+ return
nonseekable_open(inode, file)
;
}
static int ymf_ioctl_mixdev(struct inode *inode, struct file *file,
}
static int ymf_ioctl_mixdev(struct inode *inode, struct file *file,
@@
-2365,7
+2361,8
@@
static int ymfpci_memalloc(ymfpci_t *codec)
codec->dma_area_ba = pba;
codec->dma_area_size = size + 0xff;
codec->dma_area_ba = pba;
codec->dma_area_size = size + 0xff;
- if ((off = ((uint) ptr) & 0xff) != 0) {
+ off = (unsigned long)ptr & 0xff;
+ if (off) {
ptr += 0x100 - off;
pba += 0x100 - off;
}
ptr += 0x100 - off;
pba += 0x100 - off;
}