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
/
sc1200wdt.c
diff --git
a/drivers/char/watchdog/sc1200wdt.c
b/drivers/char/watchdog/sc1200wdt.c
index
9ddebae
..
df38161
100644
(file)
--- a/
drivers/char/watchdog/sc1200wdt.c
+++ b/
drivers/char/watchdog/sc1200wdt.c
@@
-157,8
+157,6
@@
static inline int sc1200wdt_status(void)
static int sc1200wdt_open(struct inode *inode, struct file *file)
{
static int sc1200wdt_open(struct inode *inode, struct file *file)
{
- nonseekable_open(inode, file);
-
/* allow one at a time */
if (down_trylock(&open_sem))
return -EBUSY;
/* allow one at a time */
if (down_trylock(&open_sem))
return -EBUSY;
@@
-260,6
+258,9
@@
static int sc1200wdt_release(struct inode *inode, struct file *file)
static ssize_t sc1200wdt_write(struct file *file, const char __user *data, size_t len, loff_t *ppos)
{
static ssize_t sc1200wdt_write(struct file *file, const char __user *data, size_t len, loff_t *ppos)
{
+ if (ppos != &file->f_pos)
+ return -ESPIPE;
+
if (len) {
if (!nowayout) {
size_t i;
if (len) {
if (!nowayout) {
size_t i;