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
/
advantechwdt.c
diff --git
a/drivers/char/watchdog/advantechwdt.c
b/drivers/char/watchdog/advantechwdt.c
index
ea73c83
..
4090794
100644
(file)
--- a/
drivers/char/watchdog/advantechwdt.c
+++ b/
drivers/char/watchdog/advantechwdt.c
@@
-102,6
+102,10
@@
advwdt_disable(void)
static ssize_t
advwdt_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos)
{
static ssize_t
advwdt_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;
@@
-196,7
+200,7
@@
advwdt_open(struct inode *inode, struct file *file)
*/
advwdt_ping();
*/
advwdt_ping();
- return
nonseekable_open(inode, file)
;
+ return
0
;
}
static int
}
static int