1 files changed, 6 insertions, 7 deletions

diff --git a/kernel/events/hw_breakpoint.c b/kernel/events/hw_breakpoint.c
index b3814fce5ecb..d6b56180827c 100644
--- a/kernel/events/hw_breakpoint.c
+++ b/kernel/events/hw_breakpoint.c
@@ -509,6 +509,8 @@ modify_user_hw_breakpoint_check(struct perf_event *bp, struct perf_event_attr *a
  */
 int modify_user_hw_breakpoint(struct perf_event *bp, struct perf_event_attr *attr)
 {
+        int err;
+
         /*
          * modify_user_hw_breakpoint can be invoked with IRQs disabled and hence it
          * will not be possible to raise IPIs that invoke __perf_event_disable.
@@ -520,15 +522,12 @@ int modify_user_hw_breakpoint(struct perf_event *bp, struct perf_event_attr *att
         else
                 perf_event_disable(bp);
 
-        if (!attr->disabled) {
-                int err = modify_user_hw_breakpoint_check(bp, attr, false);
+        err = modify_user_hw_breakpoint_check(bp, attr, false);
 
-                if (err)
-                        return err;
+        if (!bp->attr.disabled)
                 perf_event_enable(bp);
-                bp->attr.disabled = 0;
-        }
-        return 0;
+
+        return err;
 }
 EXPORT_SYMBOL_GPL(modify_user_hw_breakpoint);