Merge to Fedora Core 2 kernel-2.6.8-1.521

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

diff --git a/drivers/char/watchdog/machzwd.c b/drivers/char/watchdog/machzwd.c
index e8dc517..3782930 100644 (file)
--- a/drivers/char/watchdog/machzwd.c
+++ b/drivers/char/watchdog/machzwd.c
@@ -305,10 +305,6 @@ static void zf_ping(unsigned long data)
 static ssize_t zf_write(struct file *file, const char __user *buf, size_t count,
                                                                loff_t *ppos)
 {
-       /*  Can't seek (pwrite) on this device  */
-       if (ppos != &file->f_pos)
-               return -ESPIPE;
-
        /* See if we got the magic character */
        if(count){
 
@@ -389,7 +385,7 @@ static int zf_open(struct inode *inode, struct file *file)
 
        zf_timer_on();
 
-       return 0;
+       return nonseekable_open(inode, file);
 }
 
 static int zf_close(struct inode *inode, struct file *file)