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;