diff options
| author | Jonathan Corbet <corbet@lwn.net> | 2008-07-14 17:29:34 -0400 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2008-07-14 17:29:34 -0400 |
| commit | 2fceef397f9880b212a74c418290ce69e7ac00eb (patch) | |
| tree | d9cc09ab992825ef7fede4a688103503e3caf655 /drivers/char/ipmi | |
| parent | feae1ef116ed381625d3731c5ae4f4ebcb3fa302 (diff) | |
| parent | bce7f793daec3e65ec5c5705d2457b81fe7b5725 (diff) | |
Merge commit 'v2.6.26' into bkl-removal
Diffstat (limited to 'drivers/char/ipmi')
| -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 357d99b9d0e5..235fab0bdf79 100644 --- a/drivers/char/ipmi/ipmi_watchdog.c +++ b/drivers/char/ipmi/ipmi_watchdog.c | |||
| @@ -756,9 +756,8 @@ static ssize_t ipmi_write(struct file *file, | |||
| 756 | rv = ipmi_heartbeat(); | 756 | rv = ipmi_heartbeat(); |
| 757 | if (rv) | 757 | if (rv) |
| 758 | return rv; | 758 | return rv; |
| 759 | return 1; | ||
| 760 | } | 759 | } |
| 761 | return 0; | 760 | return len; |
| 762 | } | 761 | } |
| 763 | 762 | ||
| 764 | static ssize_t ipmi_read(struct file *file, | 763 | static ssize_t ipmi_read(struct file *file, |