perf intel-pt: Move decoder error setting into one condition

BugLink: http://bugs.launchpad.net/bugs/1707233
commit 22c06892332d8916115525145b78e606e9cc6492 upstream.

Move decoder error setting into one condition.

Cc'ed to stable because later fixes depend on it.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Link: http://lkml.kernel.org/r/1495786658-18063-2-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>

diff --git a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
index 933a509a90f89f7cf84422b475b02e5101307a6d..8041d3378f50a07f021415d0c74a8333abbb3649 100644 (file)
--- a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
+++ b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
@@ -2096,15 +2096,18 @@ const struct intel_pt_state *intel_pt_decode(struct intel_pt_decoder *decoder)
                }
        } while (err == -ENOLINK);
 
-       decoder->state.err = err ? intel_pt_ext_err(err) : 0;
+       if (err) {
+               decoder->state.err = intel_pt_ext_err(err);
+               decoder->state.from_ip = decoder->ip;
+       } else {
+               decoder->state.err = 0;
+       }
+
        decoder->state.timestamp = decoder->timestamp;
        decoder->state.est_timestamp = intel_pt_est_timestamp(decoder);
        decoder->state.cr3 = decoder->cr3;
        decoder->state.tot_insn_cnt = decoder->tot_insn_cnt;
 
-       if (err)
-               decoder->state.from_ip = decoder->ip;
-
        return &decoder->state;
 }