1 files changed, 6 insertions, 8 deletions

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index ffd02faee87b..07cb083ac89c 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -809,12 +809,12 @@ static int perf_sample__fprintf_brstackoff(struct perf_sample *sample,
                 from = br->entries[i].from;
                 to   = br->entries[i].to;
 
-                thread__find_map(thread, sample->cpumode, from, &alf);
-                if (alf.map && !alf.map->dso->adjust_symbols)
+                if (thread__find_map(thread, sample->cpumode, from, &alf) &&
+                    !alf.map->dso->adjust_symbols)
                         from = map__map_ip(alf.map, from);
 
-                thread__find_map(thread, sample->cpumode, to, &alt);
-                if (alt.map && !alt.map->dso->adjust_symbols)
+                if (thread__find_map(thread, sample->cpumode, to, &alt) &&
+                    !alt.map->dso->adjust_symbols)
                         to = map__map_ip(alt.map, to);
 
                 printed += fprintf(fp, " 0x%"PRIx64, from);
@@ -877,8 +877,7 @@ static int grab_bb(u8 *buffer, u64 start, u64 end,
                 return 0;
         }
 
-        thread__find_map(thread, *cpumode, start, &al);
-        if (!al.map || !al.map->dso) {
+        if (!thread__find_map(thread, *cpumode, start, &al) || !al.map->dso) {
                 pr_debug("\tcannot resolve %" PRIx64 "-%" PRIx64 "\n", start, end);
                 return 0;
         }
@@ -928,8 +927,7 @@ static int ip__fprintf_sym(uint64_t addr, struct thread *thread,
 
         memset(&al, 0, sizeof(al));
 
-        thread__find_map(thread, cpumode, addr, &al);
-        if (!al.map)
+        if (!thread__find_map(thread, cpumode, addr, &al))
                 __thread__find_map(thread, cpumode, MAP__VARIABLE, addr, &al);
         if ((*lastsym) && al.addr >= (*lastsym)->start && al.addr < (*lastsym)->end)
                 return 0;