1 files changed, 13 insertions, 4 deletions

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index fd3d9c8e90fc..559fb06210f5 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -833,7 +833,7 @@ int dso__load_modules(struct dso *self, symbol_filter_t filter, int v)
         struct mod_dso *mods = mod_dso__new_dso("modules");
         struct module *pos;
         struct rb_node *next;
-        int err;
+        int err, count = 0;
 
         err = mod_dso__load_modules(mods);
 
@@ -852,14 +852,16 @@ int dso__load_modules(struct dso *self, symbol_filter_t filter, int v)
                         break;
 
                 next = rb_next(&pos->rb_node);
+                count += err;
         }
 
         if (err < 0) {
                 mod_dso__delete_modules(mods);
                 mod_dso__delete_self(mods);
+                return err;
         }
 
-        return err;
+        return count;
 }
 
 static inline void dso__fill_symbol_holes(struct dso *self)
@@ -913,8 +915,15 @@ int dso__load_kernel(struct dso *self, const char *vmlinux,
 
         if (vmlinux) {
                 err = dso__load_vmlinux(self, vmlinux, filter, v);
-                if (err > 0 && use_modules)
-                        err = dso__load_modules(self, filter, v);
+                if (err > 0 && use_modules) {
+                        int syms = dso__load_modules(self, filter, v);
+
+                        if (syms < 0) {
+                                fprintf(stderr, "dso__load_modules failed!\n");
+                                return syms;
+                        }
+                        err += syms;
+                }
         }
 
         if (err <= 0)