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
/
char
/
watchdog
/
mixcomwd.c
diff --git
a/drivers/char/watchdog/mixcomwd.c
b/drivers/char/watchdog/mixcomwd.c
index
15a3547
..
2790f9c
100644
(file)
--- a/
drivers/char/watchdog/mixcomwd.c
+++ b/
drivers/char/watchdog/mixcomwd.c
@@
-108,7
+108,7
@@
static int mixcomwd_open(struct inode *inode, struct file *file)
mixcomwd_timer_alive=0;
}
}
mixcomwd_timer_alive=0;
}
}
- return
nonseekable_open(inode, file)
;
+ return
0
;
}
static int mixcomwd_release(struct inode *inode, struct file *file)
}
static int mixcomwd_release(struct inode *inode, struct file *file)
@@
-136,6
+136,10
@@
static int mixcomwd_release(struct inode *inode, struct file *file)
static ssize_t mixcomwd_write(struct file *file, const char __user *data, size_t len, loff_t *ppos)
{
static ssize_t mixcomwd_write(struct file *file, const char __user *data, size_t len, loff_t *ppos)
{
+ if (ppos != &file->f_pos) {
+ return -ESPIPE;
+ }
+
if(len)
{
if (!nowayout) {
if(len)
{
if (!nowayout) {