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
/
ib700wdt.c
diff --git
a/drivers/char/watchdog/ib700wdt.c
b/drivers/char/watchdog/ib700wdt.c
index
cd6467e
..
0d48439
100644
(file)
--- a/
drivers/char/watchdog/ib700wdt.c
+++ b/
drivers/char/watchdog/ib700wdt.c
@@
-141,6
+141,10
@@
ibwdt_ping(void)
static ssize_t
ibwdt_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
{
static ssize_t
ibwdt_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;
+
if (count) {
if (!nowayout) {
size_t i;
if (count) {
if (!nowayout) {
size_t i;
@@
-224,7
+228,7
@@
ibwdt_open(struct inode *inode, struct file *file)
/* Activate */
ibwdt_ping();
spin_unlock(&ibwdt_lock);
/* Activate */
ibwdt_ping();
spin_unlock(&ibwdt_lock);
- return
nonseekable_open(inode, file)
;
+ return
0
;
}
static int
}
static int