This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / char / watchdog / softdog.c

diff --git a/drivers/char/watchdog/softdog.c b/drivers/char/watchdog/softdog.c
index 1179034..832590d 100644 (file)
--- a/drivers/char/watchdog/softdog.c
+++ b/drivers/char/watchdog/softdog.c
@@ -141,7 +141,7 @@ static int softdog_open(struct inode *inode, struct file *file)
         *      Activate timer
         */
        softdog_keepalive();
-       return nonseekable_open(inode, file);
+       return 0;
 }
 
 static int softdog_release(struct inode *inode, struct file *file)
@@ -163,6 +163,10 @@ static int softdog_release(struct inode *inode, struct file *file)
 
 static ssize_t softdog_write(struct file *file, const char __user *data, size_t len, loff_t *ppos)
 {
+       /*  Can't seek (pwrite) on this device  */
+       if (ppos != &file->f_pos)
+               return -ESPIPE;
+
        /*
         *      Refresh the timer.
         */