1 files changed, 5 insertions, 0 deletions

diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index b45141748af5..19261fdd2455 100644
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -481,6 +481,11 @@ int register_ftrace_event(struct trace_event *event)
 
         mutex_lock(&trace_event_mutex);
 
+        if (!event) {
+                ret = next_event_type++;
+                goto out;
+        }
+
         if (!event->type)
                 event->type = next_event_type++;
         else if (event->type > __TRACE_LAST_TYPE) {