1 files changed, 5 insertions, 2 deletions

diff --git a/tools/perf/util/thread.c b/tools/perf/util/thread.c
index 49eaf1d7d89d..0358882c8910 100644
--- a/tools/perf/util/thread.c
+++ b/tools/perf/util/thread.c
@@ -66,10 +66,13 @@ struct comm *thread__comm(const struct thread *thread)
 int thread__set_comm(struct thread *thread, const char *str, u64 timestamp)
 {
         struct comm *new, *curr = thread__comm(thread);
+        int err;
 
         /* Override latest entry if it had no specific time coverage */
         if (!curr->start) {
-                comm__override(curr, str, timestamp);
+                err = comm__override(curr, str, timestamp);
+                if (err)
+                        return err;
         } else {
                 new = comm__new(str, timestamp);
                 if (!new)
@@ -126,7 +129,7 @@ int thread__fork(struct thread *thread, struct thread *parent, u64 timestamp)
                 if (!comm)
                         return -ENOMEM;
                 err = thread__set_comm(thread, comm, timestamp);
-                if (!err)
+                if (err)
                         return err;
                 thread->comm_set = true;
         }