diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-11 20:00:17 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-11 20:00:17 -0400 |
commit | a26929fb489188ff959b1715ee67f0c9f84405b5 (patch) | |
tree | def7f2c897e9eeea832bf7f738aaca08d562f882 /drivers | |
parent | 4d727a781f6c9ab8b446d6596ed2dcd6ce80bb47 (diff) | |
parent | 3976df9b04c113ab19dc0268e49c6cec6baf28f7 (diff) |
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
Diffstat (limited to 'drivers')
-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 1b9a8704781..0e6df289cb4 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, | |||
755 | rv = ipmi_heartbeat(); | 755 | rv = ipmi_heartbeat(); |
756 | if (rv) | 756 | if (rv) |
757 | return rv; | 757 | return rv; |
758 | return 1; | ||
759 | } | 758 | } |
760 | return 0; | 759 | return len; |
761 | } | 760 | } |
762 | 761 | ||
763 | static ssize_t ipmi_read(struct file *file, | 762 | static ssize_t ipmi_read(struct file *file, |