[PATCH] s390: z/VM watchdog driver bugfix.

From: Gerald Schaefer <geraldsc@de.ibm.com>

 - Remove ESPIPE logic, use nonseekable_open() instead.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/s390/char/vmwatchdog.c b/drivers/s390/char/vmwatchdog.c
index 4a9958be922708a7ac17b5c97103e066c701c873..22cf4fec8da9a64034d63296217152fc8cd61943 100644 (file)
--- a/drivers/s390/char/vmwatchdog.c
+++ b/drivers/s390/char/vmwatchdog.c
@@ -168,7 +168,7 @@ static int vmwdt_open(struct inode *i, struct file *f)
        ret = vmwdt_keepalive();
        if (ret)
                clear_bit(0, &vmwdt_is_open);
-       return ret;
+       return ret ? ret : nonseekable_open(i, f);
 }
 
 static int vmwdt_close(struct inode *i, struct file *f)
@@ -238,10 +238,6 @@ static int vmwdt_ioctl(struct inode *i, struct file *f,
 static ssize_t vmwdt_write(struct file *f, const char __user *buf,
                                size_t count, loff_t *ppos)
 {
-       /* We can't seek */
-       if(ppos != &f->f_pos)
-               return -ESPIPE;
-
        if(count) {
                if (!vmwdt_nowayout) {
                        size_t i;