From ad68871ceed4c46425bf7ca028da1f29a4ab2cc0 Mon Sep 17 00:00:00 2001
From: Wu Fengguang <fengguang.wu@intel.com>
Date: Mon, 14 Dec 2009 17:57:57 -0800
Subject: [PATCH] --- yaml --- r: 176233 b: refs/heads/master c:
 4ea2f43f28e30050bc99fe3134b6b679f3bf5b22 h: refs/heads/master i:   176231:
 38cb07bfb9cc44d046f5ba606196c8a6c2c08ccc v: v3

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

diff --git a/[refs] b/[refs]
index bf0bb51e91ab..54f3f89d84b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 659ace584e7a9fdda872eab4d6d7be1e0afb6cae
+refs/heads/master: 4ea2f43f28e30050bc99fe3134b6b679f3bf5b22
diff --git a/trunk/drivers/char/mem.c b/trunk/drivers/char/mem.c
index fba76fb55abf..f0a90590cb1a 100644
--- a/trunk/drivers/char/mem.c
+++ b/trunk/drivers/char/mem.c
@@ -581,14 +581,12 @@ static ssize_t write_kmem(struct file * file, const char __user * buf,
 
 			if (len > PAGE_SIZE)
 				len = PAGE_SIZE;
-			if (len) {
-				written = copy_from_user(kbuf, buf, len);
-				if (written) {
-					if (wrote + virtr)
-						break;
-					free_page((unsigned long)kbuf);
-					return -EFAULT;
-				}
+			written = copy_from_user(kbuf, buf, len);
+			if (written) {
+				if (wrote + virtr)
+					break;
+				free_page((unsigned long)kbuf);
+				return -EFAULT;
 			}
 			len = vwrite(kbuf, (char *)p, len);
 			count -= len;