1 files changed, 3 insertions, 8 deletions

diff --git a/kernel/events/core.c b/kernel/events/core.c
index f6ea33a9f904..22ede28ec07d 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -2867,16 +2867,11 @@ static int perf_event_modify_breakpoint(struct perf_event *bp,
         _perf_event_disable(bp);
 
         err = modify_user_hw_breakpoint_check(bp, attr, true);
-        if (err) {
-                if (!bp->attr.disabled)
-                        _perf_event_enable(bp);
 
-                return err;
-        }
-
-        if (!attr->disabled)
+        if (!bp->attr.disabled)
                 _perf_event_enable(bp);
-        return 0;
+
+        return err;
 }
 
 static int perf_event_modify_attr(struct perf_event *event,