2 files changed, 12 insertions, 10 deletions

diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
index 919037bc9808..438a7bb101d3 100644
--- a/tools/perf/builtin-probe.c
+++ b/tools/perf/builtin-probe.c
@@ -261,15 +261,19 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used)
 
                 lseek(fd, SEEK_SET, 0);
                 ret = find_probepoint(fd, pp);
-                if (ret < 0) {
-                        if (session.need_dwarf)
-                                die("Could not analyze debuginfo.");
-
-                        pr_warning("An error occurred in debuginfo analysis. Try to use symbols.\n");
-                        break;
-                }
+                if (ret > 0)
+                        continue;
                 if (ret == 0)   /* No error but failed to find probe point. */
                         die("No probe point found.");
+                /* Error path */
+                if (session.need_dwarf) {
+                        if (ret == -ENOENT)
+                                pr_warning("No dwarf info found in the vmlinux - please rebuild with CONFIG_DEBUG_INFO=y.\n");
+                        die("Could not analyze debuginfo.");
+                }
+                pr_debug("An error occurred in debuginfo analysis."
+                         " Try to use symbols.\n");
+                break;
         }
         close(fd);
 
diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c
index 4585f1d86792..4b852c0d16a5 100644
--- a/tools/perf/util/probe-finder.c
+++ b/tools/perf/util/probe-finder.c
@@ -687,10 +687,8 @@ int find_probepoint(int fd, struct probe_point *pp)
         struct probe_finder pf = {.pp = pp};
 
         ret = dwarf_init(fd, DW_DLC_READ, 0, 0, &__dw_debug, &__dw_error);
-        if (ret != DW_DLV_OK) {
-                pr_warning("No dwarf info found in the vmlinux - please rebuild with CONFIG_DEBUG_INFO.\n");
+        if (ret != DW_DLV_OK)
                 return -ENOENT;
-        }
 
         pp->found = 0;
         while (++cu_number) {