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
/
sbc60xxwdt.c
diff --git
a/drivers/char/watchdog/sbc60xxwdt.c
b/drivers/char/watchdog/sbc60xxwdt.c
index
d7de988
..
b1c2990
100644
(file)
--- a/
drivers/char/watchdog/sbc60xxwdt.c
+++ b/
drivers/char/watchdog/sbc60xxwdt.c
@@
-168,6
+168,10
@@
static void wdt_keepalive(void)
static ssize_t fop_write(struct file * file, const char __user * buf, size_t count, loff_t * ppos)
{
static ssize_t fop_write(struct file * file, const char __user * buf, size_t count, loff_t * ppos)
{
+ /* We can't seek */
+ if(ppos != &file->f_pos)
+ return -ESPIPE;
+
/* See if we got the magic character 'V' and reload the timer */
if(count)
{
/* See if we got the magic character 'V' and reload the timer */
if(count)
{
@@
-198,8
+202,6
@@
static ssize_t fop_write(struct file * file, const char __user * buf, size_t cou
static int fop_open(struct inode * inode, struct file * file)
{
static int fop_open(struct inode * inode, struct file * file)
{
- nonseekable_open(inode, file);
-
/* Just in case we're already talking to someone... */
if(test_and_set_bit(0, &wdt_is_open))
return -EBUSY;
/* Just in case we're already talking to someone... */
if(test_and_set_bit(0, &wdt_is_open))
return -EBUSY;