From 5ffca27beca584a8c45d99b052b8cab445c2ca99 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Tue, 22 Feb 2011 06:56:18 -0300
Subject: [PATCH] --- yaml --- r: 234463 b: refs/heads/master c:
 8635bf6ea3402154eec64763e6ed14972013c1c1 h: refs/heads/master i:   234461:
 da9cc7bdeabfaf0c96242b508ba9afeb2ea0ea4e   234459:
 909b6e0ba6db7eb466f95d8b68b0a7b2b0616f4e   234455:
 b84643fa28144a4707b9c57bc85cf0ebd9e3a478   234447:
 500ca513ce2a0c261242110a3122aeb81a2afef1   234431:
 21d26d613e05c770332a9f3543d22822435ad76c v: v3

---
 [refs]                               | 2 +-
 trunk/tools/perf/util/probe-event.c  | 2 +-
 trunk/tools/perf/util/probe-finder.c | 5 ++---
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 576b8e7f15d1..d9ec6d60f9c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e603dc15072c7fec0ae263597e6dabc3bb4c5c5b
+refs/heads/master: 8635bf6ea3402154eec64763e6ed14972013c1c1
diff --git a/trunk/tools/perf/util/probe-event.c b/trunk/tools/perf/util/probe-event.c
index 369ddc64bbb6..5ddee66020a7 100644
--- a/trunk/tools/perf/util/probe-event.c
+++ b/trunk/tools/perf/util/probe-event.c
@@ -1832,7 +1832,7 @@ int add_perf_probe_events(struct perf_probe_event *pevs, int npevs,
 	}
 
 	/* Loop 2: add all events */
-	for (i = 0; i < npevs && ret >= 0; i++) {
+	for (i = 0; i < npevs; i++) {
 		ret = __add_probe_trace_events(pkgs[i].pev, pkgs[i].tevs,
 						pkgs[i].ntevs, force_add);
 		if (ret < 0)
diff --git a/trunk/tools/perf/util/probe-finder.c b/trunk/tools/perf/util/probe-finder.c
index eecbdca5c0d5..17f9c4a66ddd 100644
--- a/trunk/tools/perf/util/probe-finder.c
+++ b/trunk/tools/perf/util/probe-finder.c
@@ -1462,8 +1462,7 @@ static int find_probes(int fd, struct probe_finder *pf)
 	off = 0;
 	line_list__init(&pf->lcache);
 	/* Loop on CUs (Compilation Unit) */
-	while (!dwarf_nextcu(dbg, off, &noff, &cuhl, NULL, NULL, NULL) &&
-	       ret >= 0) {
+	while (!dwarf_nextcu(dbg, off, &noff, &cuhl, NULL, NULL, NULL)) {
 		/* Get the DIE(Debugging Information Entry) of this CU */
 		diep = dwarf_offdie(dbg, off + cuhl, &pf->cu_die);
 		if (!diep)
@@ -1484,7 +1483,7 @@ static int find_probes(int fd, struct probe_finder *pf)
 				pf->lno = pp->line;
 				ret = find_probe_point_by_line(pf);
 			}
-			if (ret != DWARF_CB_OK)
+			if (ret < 0)
 				break;
 		}
 		off = noff;