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
/
indydog.c
diff --git
a/drivers/char/watchdog/indydog.c
b/drivers/char/watchdog/indydog.c
index
4e9093b
..
23fc364
100644
(file)
--- a/
drivers/char/watchdog/indydog.c
+++ b/
drivers/char/watchdog/indydog.c
@@
-81,7
+81,7
@@
static int indydog_open(struct inode *inode, struct file *file)
indydog_alive = 1;
printk(KERN_INFO "Started watchdog timer.\n");
indydog_alive = 1;
printk(KERN_INFO "Started watchdog timer.\n");
- return
nonseekable_open(inode, file)
;
+ return
0
;
}
static int indydog_release(struct inode *inode, struct file *file)
}
static int indydog_release(struct inode *inode, struct file *file)
@@
-98,6
+98,10
@@
static int indydog_release(struct inode *inode, struct file *file)
static ssize_t indydog_write(struct file *file, const char *data, size_t len, loff_t *ppos)
{
static ssize_t indydog_write(struct file *file, const char *data, size_t len, loff_t *ppos)
{
+ /* Can't seek (pwrite) on this device */
+ if (ppos != &file->f_pos)
+ return -ESPIPE;
+
/* Refresh the timer. */
if (len) {
indydog_ping();
/* Refresh the timer. */
if (len) {
indydog_ping();