aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Hunter <adrian.hunter@intel.com>2016-09-23 10:38:37 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2016-09-29 10:17:01 -0400
commit5c01ad60b8a23f8ff59b9a5a756f07ed08f0b6d1 (patch)
tree018f44434ec7de86634e0086133bdaa3917a8006
parent394c01ed8aafdf0f14fb18c6d320d8a783da243c (diff)
perf record: Fix error paths
Some error paths do not tidy-up. Fix that. Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Mathieu Poirier <mathieu.poirier@linaro.org> Link: http://lkml.kernel.org/r/1474641528-18776-6-git-send-email-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r--tools/perf/builtin-record.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index b32a880ec473..962adcfc43a5 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -1573,23 +1573,23 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused)
1573 if (!rec->itr) { 1573 if (!rec->itr) {
1574 rec->itr = auxtrace_record__init(rec->evlist, &err); 1574 rec->itr = auxtrace_record__init(rec->evlist, &err);
1575 if (err) 1575 if (err)
1576 return err; 1576 goto out;
1577 } 1577 }
1578 1578
1579 err = auxtrace_parse_snapshot_options(rec->itr, &rec->opts, 1579 err = auxtrace_parse_snapshot_options(rec->itr, &rec->opts,
1580 rec->opts.auxtrace_snapshot_opts); 1580 rec->opts.auxtrace_snapshot_opts);
1581 if (err) 1581 if (err)
1582 return err; 1582 goto out;
1583 1583
1584 if (dry_run) 1584 if (dry_run)
1585 return 0; 1585 goto out;
1586 1586
1587 err = bpf__setup_stdout(rec->evlist); 1587 err = bpf__setup_stdout(rec->evlist);
1588 if (err) { 1588 if (err) {
1589 bpf__strerror_setup_stdout(rec->evlist, err, errbuf, sizeof(errbuf)); 1589 bpf__strerror_setup_stdout(rec->evlist, err, errbuf, sizeof(errbuf));
1590 pr_err("ERROR: Setup BPF stdout failed: %s\n", 1590 pr_err("ERROR: Setup BPF stdout failed: %s\n",
1591 errbuf); 1591 errbuf);
1592 return err; 1592 goto out;
1593 } 1593 }
1594 1594
1595 err = -ENOMEM; 1595 err = -ENOMEM;