diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-05-20 14:07:23 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-05-20 14:07:23 -0400 |
| commit | df760137ad3cbfa15ceed42478f81bff01b6e799 (patch) | |
| tree | be939c9d11094858d74141a4c62cb23f477754d8 /kernel/perf_event.c | |
| parent | 754b8e653412106ff613f4750b197f807fcd8347 (diff) | |
| parent | de997718b64df2f766736f23f8557da450b83a25 (diff) | |
Merge branch 'omap-boards' into omap-for-linus
Diffstat (limited to 'kernel/perf_event.c')
| -rw-r--r-- | kernel/perf_event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/perf_event.c b/kernel/perf_event.c index 2f3fbf84215a..3d1552d3c12b 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c | |||
| @@ -4897,7 +4897,7 @@ err_fput_free_put_context: | |||
| 4897 | 4897 | ||
| 4898 | err_free_put_context: | 4898 | err_free_put_context: |
| 4899 | if (err < 0) | 4899 | if (err < 0) |
| 4900 | kfree(event); | 4900 | free_event(event); |
| 4901 | 4901 | ||
| 4902 | err_put_context: | 4902 | err_put_context: |
| 4903 | if (err < 0) | 4903 | if (err < 0) |