From cfb369db0c75108795910fc91d3af0ffc2edad99 Mon Sep 17 00:00:00 2001
From: Tom Zanussi <tzanussi@gmail.com>
Date: Wed, 5 May 2010 00:27:40 -0500
Subject: [PATCH] --- yaml --- r: 191327 b: refs/heads/master c:
 794e43b56c18b95fc9776c914a2659e7d558a352 h: refs/heads/master i:   191325:
 8fadc24b371dd118e2d27bf6fb3387e193752a4e   191323:
 a8f49fcb54c3ddc9b7fa2f6a2c12270228f09c29   191319:
 41143c90de47a0c6c1f0eb7b1165d61fc32dd1c6   191311:
 874c503ca644fa2a26684d61b252fe880d31e3bf   191295:
 0d5e83c79668300bf3b3b88247b9d6dfcda2528e v: v3

---
 [refs]                          |  2 +-
 trunk/tools/perf/util/session.c | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 00f407cb52e3..742566200e15 100644
--- 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
index 9401909fa283..00ab298bbb4b 100644
--- 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 ||