Merge tag 'v3.10.57' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / kernel / events / core.c

diff --git a/kernel/events/core.c b/kernel/events/core.c
index cd17762037819d63dee7c1424abf56a989834aa9..09d72c0a7d4a95144b707970b883bfeb1034e8fa 100644 (file)
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -7479,8 +7479,10 @@ int perf_event_init_task(struct task_struct *child)
 
        for_each_task_context_nr(ctxn) {
                ret = perf_event_init_context(child, ctxn);
-               if (ret)
+               if (ret) {
+                       perf_event_free_task(child);
                        return ret;
+               }
        }
 
        return 0;