ARM: Merge for-2635/samsung-hwmon

[linux-2.6-block.git] / kernel / perf_event.c

diff --git a/kernel/perf_event.c b/kernel/perf_event.c
index 2f3fbf84215a940cc40eccef9c8304964d10906f..3d1552d3c12b0b632964f0f5b053bbe6a03e72e0 100644 (file)
--- a/kernel/perf_event.c
+++ b/kernel/perf_event.c
@@ -4897,7 +4897,7 @@ err_fput_free_put_context:
 
 err_free_put_context:
        if (err < 0)
-               kfree(event);
+               free_event(event);
 
 err_put_context:
        if (err < 0)