1 files changed, 3 insertions, 1 deletions

diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 7ee08b95c384..5892470bc2ee 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -291,9 +291,11 @@ static int __ftrace_event_enable_disable(struct ftrace_event_file *file,
                         }
                         call->class->reg(call, TRACE_REG_UNREGISTER, file);
                 }
-                /* If in SOFT_MODE, just set the SOFT_DISABLE_BIT */
+                /* If in SOFT_MODE, just set the SOFT_DISABLE_BIT, else clear it */
                 if (file->flags & FTRACE_EVENT_FL_SOFT_MODE)
                         set_bit(FTRACE_EVENT_FL_SOFT_DISABLED_BIT, &file->flags);
+                else
+                        clear_bit(FTRACE_EVENT_FL_SOFT_DISABLED_BIT, &file->flags);
                 break;
         case 1:
                 /*