Merge branch 'tracing/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into tracing/core

1 files changed, 6 insertions, 5 deletions

diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index c6b2edfb7fe9..93660fbbf629 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -409,6 +409,9 @@ static int init_preds(struct ftrace_event_call *call)
         struct filter_pred *pred;
         int i;
 
+        if (call->filter)
+                return 0;
+
         filter = call->filter = kzalloc(sizeof(*filter), GFP_KERNEL);
         if (!call->filter)
                 return -ENOMEM;
@@ -447,11 +450,9 @@ static int init_subsystem_preds(struct event_subsystem *system)
                 if (strcmp(call->system, system->name) != 0)
                         continue;
 
-                if (!call->filter) {
-                        err = init_preds(call);
-                        if (err)
-                                return err;
-                }
+                err = init_preds(call);
+                if (err)
+                        return err;
         }
 
         return 0;