diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-12 02:00:17 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-12 02:00:17 +0200 |
| commit | a26929fb489188ff959b1715ee67f0c9f84405b5 (patch) | |
| tree | def7f2c897e9eeea832bf7f738aaca08d562f882 | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | [PATCH] IPMI: return correct value from ipmi_write (diff) | |
| download | linux-a26929fb489188ff959b1715ee67f0c9f84405b5.tar.xz linux-a26929fb489188ff959b1715ee67f0c9f84405b5.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[PATCH] IPMI: return correct value from ipmi_write
| -rw-r--r-- | drivers/char/ipmi/ipmi_watchdog.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c index 1b9a87047817..0e6df289cb46 100644 --- a/drivers/char/ipmi/ipmi_watchdog.c +++ b/drivers/char/ipmi/ipmi_watchdog.c @@ -755,9 +755,8 @@ static ssize_t ipmi_write(struct file *file, rv = ipmi_heartbeat(); if (rv) return rv; - return 1; } - return 0; + return len; } static ssize_t ipmi_read(struct file *file, |