From 9f586b5af44b7a38741111e7796c93edd0b4bd75 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Thu, 2 Jun 2011 10:55:10 -0300
Subject: [PATCH] --- yaml --- r: 257026 b: refs/heads/master c:
 5c6970af2f4be4e04b06fe78214f6809777a8354 h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/tools/perf/util/python.c | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index ce8dc50de9ee..b30c1bc64b4a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bccdaba044a445eb2c391295587aa47977994777
+refs/heads/master: 5c6970af2f4be4e04b06fe78214f6809777a8354
diff --git a/trunk/tools/perf/util/python.c b/trunk/tools/perf/util/python.c
index 69436b3200a4..2dd1698e0932 100644
--- a/trunk/tools/perf/util/python.c
+++ b/trunk/tools/perf/util/python.c
@@ -694,14 +694,12 @@ static PyObject *pyrf_evlist__read_on_cpu(struct pyrf_evlist *pevlist,
 		err = perf_event__parse_sample(event, first->attr.sample_type,
 					       perf_sample_size(first->attr.sample_type),
 					       sample_id_all, &pevent->sample);
-		if (err) {
-			pr_err("Can't parse sample, err = %d\n", err);
-			goto end;
-		}
-
+		if (err)
+			return PyErr_Format(PyExc_OSError,
+					    "perf: can't parse sample, err=%d", err);
 		return pyevent;
 	}
-end:
+
 	Py_INCREF(Py_None);
 	return Py_None;
 }