1 files changed, 2 insertions, 4 deletions

diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c
index 441e681a46a0..a272b35f6c5a 100644
--- a/tools/perf/util/intel-pt.c
+++ b/tools/perf/util/intel-pt.c
@@ -442,8 +442,7 @@ static int intel_pt_walk_next_insn(struct intel_pt_insn *intel_pt_insn,
         }
 
         while (1) {
-                thread__find_map(thread, cpumode, *ip, &al);
-                if (!al.map || !al.map->dso)
+                if (!thread__find_map(thread, cpumode, *ip, &al) || !al.map->dso)
                         return -EINVAL;
 
                 if (al.map->dso->data.status == DSO_DATA_STATUS_ERROR &&
@@ -596,8 +595,7 @@ static int __intel_pt_pgd_ip(uint64_t ip, void *data)
         if (!thread)
                 return -EINVAL;
 
-        thread__find_map(thread, cpumode, ip, &al);
-        if (!al.map || !al.map->dso)
+        if (!thread__find_map(thread, cpumode, ip, &al) || !al.map->dso)
                 return -EINVAL;
 
         offset = al.map->map_ip(al.map, ip);