Commit a26929fb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 4d727a78 3976df9b

drivers/char/ipmi/ipmi_watchdog.c

+1 −2
Original line number Diff line number Diff line
@@ -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,