Merge tag 'powerpc-4.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux

[firefly-linux-kernel-4.4.55.git] / arch / powerpc / perf / core-book3s.c

diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c
index 7fd60dcb2cb0ebd734a7f2659bd70ae25632d374..12b638425bb9b543f4761246bbb7709e64d379cb 100644 (file)
--- a/arch/powerpc/perf/core-book3s.c
+++ b/arch/powerpc/perf/core-book3s.c
@@ -1837,8 +1837,10 @@ static int power_pmu_event_init(struct perf_event *event)
                cpuhw->bhrb_filter = ppmu->bhrb_filter_map(
                                        event->attr.branch_sample_type);
 
-               if(cpuhw->bhrb_filter == -1)
+               if (cpuhw->bhrb_filter == -1) {
+                       put_cpu_var(cpu_hw_events);
                        return -EOPNOTSUPP;
+               }
        }
 
        put_cpu_var(cpu_hw_events);