---

yaml --- r: 191327 b: refs/heads/master c: 794e43b h: refs/heads/master i: 191325: 8fadc24 191323: a8f49fc 191319: 41143c9 191311: 874c503 191295: 0d5e83c v: v3
git-mirror · May 9, 2010 · cfb369d · cfb369d
1 parent 7d73bb4
commit cfb369d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2c193c736803ceb547daec725e5c5d992d039f20
+refs/heads/master: 794e43b56c18b95fc9776c914a2659e7d558a352
diff --git a/trunk/tools/perf/util/session.c b/trunk/tools/perf/util/session.c
@@ -696,15 +696,18 @@ static int __perf_session__process_pipe_events(struct perf_session *self,
 	p = &event;
 	p += sizeof(struct perf_event_header);
 
-	err = do_read(self->fd, p, size - sizeof(struct perf_event_header));
-	if (err <= 0) {
-		if (err == 0) {
-			pr_err("unexpected end of event stream\n");
-			goto done;
-		}
+	if (size - sizeof(struct perf_event_header)) {
+		err = do_read(self->fd, p,
+			      size - sizeof(struct perf_event_header));
+		if (err <= 0) {
+			if (err == 0) {
+				pr_err("unexpected end of event stream\n");
+				goto done;
+			}
 
-		pr_err("failed to read event data\n");
-		goto out_err;
+			pr_err("failed to read event data\n");
+			goto out_err;
+		}
 	}
 
 	if (size == 0 ||