2 files changed, 1 insertions, 3 deletions

diff --git a/kernel/events/callchain.c b/kernel/events/callchain.c
index 057e24b665cf..6581a040f399 100644
--- a/kernel/events/callchain.c
+++ b/kernel/events/callchain.c
@@ -115,8 +115,6 @@ int get_callchain_buffers(void)
         }
 
         err = alloc_callchain_buffers();
-        if (err)
-                release_callchain_buffers();
 exit:
         mutex_unlock(&callchain_mutex);
 
diff --git a/kernel/events/core.c b/kernel/events/core.c
index a8f4ac001a00..32b48c889711 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -815,7 +815,7 @@ static void update_event_times(struct perf_event *event)
          * here.
          */
         if (is_cgroup_event(event))
-                run_end = perf_event_time(event);
+                run_end = perf_cgroup_event_time(event);
         else if (ctx->is_active)
                 run_end = ctx->time;
         else