---

yaml --- r: 304860 b: refs/heads/master c: 5a26c8f h: refs/heads/master v: v3
git-mirror · Apr 24, 2012 · 039a852 · 039a852
1 parent 41fc9e3
commit 039a852
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07d777fe8c3985bc83428c2866713c2d1b3d4129
+refs/heads/master: 5a26c8f0cf1e95106858bb4e23ca6dd14c9b842f
diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c
@@ -629,17 +629,14 @@ ssize_t trace_seq_to_user(struct trace_seq *s, char __user *ubuf, size_t cnt)
 static ssize_t trace_seq_to_buffer(struct trace_seq *s, void *buf, size_t cnt)
 {
 	int len;
-	void *ret;
 
 	if (s->len <= s->readpos)
 		return -EBUSY;
 
 	len = s->len - s->readpos;
 	if (cnt > len)
 		cnt = len;
-	ret = memcpy(buf, s->buffer + s->readpos, cnt);
-	if (!ret)
-		return -EFAULT;
+	memcpy(buf, s->buffer + s->readpos, cnt);
 
 	s->readpos += cnt;
 	return cnt;