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
/
alim7101_wdt.c
diff --git
a/drivers/char/watchdog/alim7101_wdt.c
b/drivers/char/watchdog/alim7101_wdt.c
index
5ff6a6e
..
c137cd3
100644
(file)
--- a/
drivers/char/watchdog/alim7101_wdt.c
+++ b/
drivers/char/watchdog/alim7101_wdt.c
@@
-150,6
+150,10
@@
static void wdt_keepalive(void)
static ssize_t fop_write(struct file * file, const char __user * buf, size_t count, loff_t * ppos)
{
static ssize_t fop_write(struct file * file, const char __user * buf, size_t count, loff_t * ppos)
{
+ /* We can't seek */
+ if(ppos != &file->f_pos)
+ return -ESPIPE;
+
/* See if we got the magic character 'V' and reload the timer */
if(count) {
if (!nowayout) {
/* See if we got the magic character 'V' and reload the timer */
if(count) {
if (!nowayout) {
@@
-181,7
+185,7
@@
static int fop_open(struct inode * inode, struct file * file)
return -EBUSY;
/* Good, fire up the show */
wdt_startup();
return -EBUSY;
/* Good, fire up the show */
wdt_startup();
- return
nonseekable_open(inode, file)
;
+ return
0
;
}
static int fop_close(struct inode * inode, struct file * file)
}
static int fop_close(struct inode * inode, struct file * file)