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]
/
drivers
/
isdn
/
i4l
/
isdn_common.c
diff --git
a/drivers/isdn/i4l/isdn_common.c
b/drivers/isdn/i4l/isdn_common.c
index
4956e2e
..
eb71c80
100644
(file)
--- a/
drivers/isdn/i4l/isdn_common.c
+++ b/
drivers/isdn/i4l/isdn_common.c
@@
-946,6
+946,9
@@
isdn_read(struct file *file, char __user *buf, size_t count, loff_t * off)
int retval;
char *p;
int retval;
char *p;
+ if (off != &file->f_pos)
+ return -ESPIPE;
+
lock_kernel();
if (minor == ISDN_MINOR_STATUS) {
if (!file->private_data) {
lock_kernel();
if (minor == ISDN_MINOR_STATUS) {
if (!file->private_data) {
@@
-1048,6
+1051,9
@@
isdn_write(struct file *file, const char __user *buf, size_t count, loff_t * off
int chidx;
int retval;
int chidx;
int retval;
+ if (off != &file->f_pos)
+ return -ESPIPE;
+
if (minor == ISDN_MINOR_STATUS)
return -EPERM;
if (!dev->drivers)
if (minor == ISDN_MINOR_STATUS)
return -EPERM;
if (!dev->drivers)
@@
-1653,7
+1659,6
@@
isdn_open(struct inode *ino, struct file *filep)
}
#endif
out:
}
#endif
out:
- nonseekable_open(ino, filep);
return retval;
}
return retval;
}