From e6a8b44c9072fed685b642bf776b96af08601da7 Mon Sep 17 00:00:00 2001
From: Guillaume Chazarain <guichaz@yahoo.fr>
Date: Sun, 8 Jan 2006 01:02:43 -0800
Subject: [PATCH] --- yaml --- r: 16954 b: refs/heads/master c:
 cd140a5c1f456f50897af4a2e9a23d228a5fe719 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/char/mem.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4497c684010f..a811c0de4eb5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 025510cd20f4c35c3958bea133d96c9bd7c6ef9e
+refs/heads/master: cd140a5c1f456f50897af4a2e9a23d228a5fe719
diff --git a/trunk/drivers/char/mem.c b/trunk/drivers/char/mem.c
index 91dd669273e0..a85f3a361442 100644
--- a/trunk/drivers/char/mem.c
+++ b/trunk/drivers/char/mem.c
@@ -817,7 +817,7 @@ static ssize_t kmsg_write(struct file * file, const char __user * buf,
 			  size_t count, loff_t *ppos)
 {
 	char *tmp;
-	int ret;
+	ssize_t ret;
 
 	tmp = kmalloc(count + 1, GFP_KERNEL);
 	if (tmp == NULL)
@@ -826,6 +826,9 @@ static ssize_t kmsg_write(struct file * file, const char __user * buf,
 	if (!copy_from_user(tmp, buf, count)) {
 		tmp[count] = 0;
 		ret = printk("%s", tmp);
+		if (ret > count)
+			/* printk can add a prefix */
+			ret = count;
 	}
 	kfree(tmp);
 	return ret;