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; }