1 files changed, 6 insertions, 4 deletions

diff --git a/kernel/trace/trace_events_trigger.c b/kernel/trace/trace_events_trigger.c
index 4b5e8ed68d77..b38f617b6181 100644
--- a/kernel/trace/trace_events_trigger.c
+++ b/kernel/trace/trace_events_trigger.c
@@ -538,11 +538,12 @@ static int register_trigger(char *glob, struct event_trigger_ops *ops,
         list_add_rcu(&data->list, &file->triggers);
         ret++;
 
+        update_cond_flag(file);
         if (trace_event_trigger_enable_disable(file, 1) < 0) {
                 list_del_rcu(&data->list);
+                update_cond_flag(file);
                 ret--;
         }
-        update_cond_flag(file);
 out:
         return ret;
 }
@@ -570,8 +571,8 @@ static void unregister_trigger(char *glob, struct event_trigger_ops *ops,
                 if (data->cmd_ops->trigger_type == test->cmd_ops->trigger_type) {
                         unregistered = true;
                         list_del_rcu(&data->list);
-                        update_cond_flag(file);
                         trace_event_trigger_enable_disable(file, 0);
+                        update_cond_flag(file);
                         break;
                 }
         }
@@ -1314,11 +1315,12 @@ static int event_enable_register_trigger(char *glob,
         list_add_rcu(&data->list, &file->triggers);
         ret++;
 
+        update_cond_flag(file);
         if (trace_event_trigger_enable_disable(file, 1) < 0) {
                 list_del_rcu(&data->list);
+                update_cond_flag(file);
                 ret--;
         }
-        update_cond_flag(file);
 out:
         return ret;
 }
@@ -1339,8 +1341,8 @@ static void event_enable_unregister_trigger(char *glob,
                     (enable_data->file == test_enable_data->file)) {
                         unregistered = true;
                         list_del_rcu(&data->list);
-                        update_cond_flag(file);
                         trace_event_trigger_enable_disable(file, 0);
+                        update_cond_flag(file);
                         break;
                 }
         }