From a3eafbdd034dc4737ff0111e4b67e9b344a7480f 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: 253263 b: refs/heads/master c:
 9c850d6c4b95bb07fb066eb7f43dd4e3b4842b85 h: refs/heads/master i:   253261:
 1b2ae015848c27a78e929b96cb60bae10fda0904   253259:
 05beac1c1ba503d83308bb77f4190077bbe41f7b   253255:
 8e1938ea8a779e0416c4bf30f3fc0d192985dc13   253247:
 d9397e788c9dc6954dcbc15e7aa5051c414579c5 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 0624389183b9..db7af501ec30 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d21cc9f67d689effbfd24bac878bc2c057de8c46
+refs/heads/master: 9c850d6c4b95bb07fb066eb7f43dd4e3b4842b85
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;
 }