1 files changed, 5 insertions, 3 deletions

diff --git a/arch/x86/kernel/cpu/perf_event_intel_cqm.c b/arch/x86/kernel/cpu/perf_event_intel_cqm.c
index 63391f860175..2ce69c0953ab 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_cqm.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_cqm.c
@@ -974,10 +974,12 @@ static void intel_cqm_event_start(struct perf_event *event, int mode)
 
         event->hw.cqm_state &= ~PERF_HES_STOPPED;
 
-        if (state->cnt++)
-                WARN_ON_ONCE(state->rmid != rmid);
-        else
+        if (state->cnt++) {
+                if (!WARN_ON_ONCE(state->rmid != rmid))
+                        return;
+        } else {
                 WARN_ON_ONCE(state->rmid);
+        }
 
         state->rmid = rmid;
         /*