[patch 2/2] s390: z/VM watchdog driver bugfix.
From: Heiko Carstens
Date: Thu Dec 16 2004 - 03:29:02 EST
[patch 2/2] s390: z/VM watchdog driver bugfix.
From: Gerald Schaefer <geraldsc@xxxxxxxxxx>
- Remove ESPIPE logic, use nonseekable_open() instead.
Signed-off-by: Heiko Carstens <heiko.carstens@xxxxxxxxxx>
diffstat:
drivers/s390/char/vmwatchdog.c | 6 +-----
1 files changed, 1 insertion(+), 5 deletions(-)
diff -urN linux-2.6/drivers/s390/char/vmwatchdog.c linux-2.6-patched/drivers/s390/char/vmwatchdog.c
--- linux-2.6/drivers/s390/char/vmwatchdog.c 2004-12-16 08:52:03.000000000 +0100
+++ linux-2.6-patched/drivers/s390/char/vmwatchdog.c 2004-12-16 08:52:24.000000000 +0100
@@ -168,7 +168,7 @@
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 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;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/