Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-wat…

…chdog * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: [PATCH] IPMI: return correct value from ipmi_write
ambv · Jul 12, 2008 · a26929f · a26929f
2 parents 4d727a7 + 3976df9
commit a26929f
Showing 1 changed file with 1 addition and 2 deletions.
diff --git 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,