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
This commit is contained in:
Linus Torvalds
2008-07-11 17:00:17 -07:00

View File

@@ -755,9 +755,8 @@ static ssize_t ipmi_write(struct file *file,
rv = ipmi_heartbeat(); rv = ipmi_heartbeat();
if (rv) if (rv)
return rv; return rv;
return 1;
} }
return 0; return len;
} }
static ssize_t ipmi_read(struct file *file, static ssize_t ipmi_read(struct file *file,