From c5acf676e26f1b3d420cbad070eb44b25458abff Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Fri, 2 Apr 2010 12:30:57 -0300
Subject: [PATCH] --- yaml --- r: 191171 b: refs/heads/master c:
 2aefa4f733f2c5ce51dd2316ffecb258463fde71 h: refs/heads/master i:   191169:
 dbe11c711bf636ee8e70bdae822ed42f7cc2150c   191167:
 14eb9abe70b32690c7dcc3438fa6eb87b4b3b60a v: v3

---
 [refs]                            | 2 +-
 trunk/tools/perf/builtin-report.c | 3 ++-
 trunk/tools/perf/util/sort.c      | 5 ++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 205d45f60541..ac556eae73c6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad5b217b152d99ca3922153500c619d9758dd87a
+refs/heads/master: 2aefa4f733f2c5ce51dd2316ffecb258463fde71
diff --git a/trunk/tools/perf/builtin-report.c b/trunk/tools/perf/builtin-report.c
index 6767f10615ea..b13a7e2f839e 100644
--- a/trunk/tools/perf/builtin-report.c
+++ b/trunk/tools/perf/builtin-report.c
@@ -473,7 +473,8 @@ int cmd_report(int argc, const char **argv, const char *prefix __used)
 	setup_sorting(report_usage, options);
 
 	if (parent_pattern != default_parent_pattern) {
-		sort_dimension__add("parent");
+		if (sort_dimension__add("parent") < 0)
+			return -1;
 		sort_parent.elide = 1;
 	} else
 		symbol_conf.exclude_other = false;
diff --git a/trunk/tools/perf/util/sort.c b/trunk/tools/perf/util/sort.c
index 31329a1cd324..9d24d4b2c8fb 100644
--- a/trunk/tools/perf/util/sort.c
+++ b/trunk/tools/perf/util/sort.c
@@ -264,9 +264,8 @@ int sort_dimension__add(const char *tok)
 				char err[BUFSIZ];
 
 				regerror(ret, &parent_regex, err, sizeof(err));
-				fprintf(stderr, "Invalid regex: %s\n%s",
-					parent_pattern, err);
-				exit(-1);
+				pr_err("Invalid regex: %s\n%s", parent_pattern, err);
+				return -EINVAL;
 			}
 			sort__has_parent = 1;
 		}