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
/
ite8172.c
diff --git
a/sound/oss/ite8172.c
b/sound/oss/ite8172.c
index
16e7d01
..
f62efd8
100644
(file)
--- a/
sound/oss/ite8172.c
+++ b/
sound/oss/ite8172.c
@@
-878,7
+878,7
@@
static int it8172_open_mixdev(struct inode *inode, struct file *file)
break;
}
file->private_data = s;
break;
}
file->private_data = s;
- return
nonseekable_open(inode, file)
;
+ return
0
;
}
static int it8172_release_mixdev(struct inode *inode, struct file *file)
}
static int it8172_release_mixdev(struct inode *inode, struct file *file)
@@
-1093,6
+1093,8
@@
static ssize_t it8172_read(struct file *file, char *buffer,
unsigned long flags;
int cnt, remainder, avail;
unsigned long flags;
int cnt, remainder, avail;
+ if (ppos != &file->f_pos)
+ return -ESPIPE;
if (db->mapped)
return -ENXIO;
if (!access_ok(VERIFY_WRITE, buffer, count))
if (db->mapped)
return -ENXIO;
if (!access_ok(VERIFY_WRITE, buffer, count))
@@
-1174,6
+1176,8
@@
static ssize_t it8172_write(struct file *file, const char *buffer,
unsigned long flags;
int cnt, remainder, avail;
unsigned long flags;
int cnt, remainder, avail;
+ if (ppos != &file->f_pos)
+ return -ESPIPE;
if (db->mapped)
return -ENXIO;
if (!access_ok(VERIFY_READ, buffer, count))
if (db->mapped)
return -ENXIO;
if (!access_ok(VERIFY_READ, buffer, count))
@@
-1839,7
+1843,7
@@
static int it8172_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
nonseekable_open(inode, file)
;
+ return
0
;
}
static int it8172_release(struct inode *inode, struct file *file)
}
static int it8172_release(struct inode *inode, struct file *file)