diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-05-19 13:12:41 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-05-19 13:12:41 -0400 |
| commit | 8d0bc2b456103a34c11e01305cd1aed1cde579e5 (patch) | |
| tree | 5e1e6ad55cc9e2b5c5617f6f320114b8cff9e3f3 /kernel/perf_event.c | |
| parent | 30ba3ead05763b172acaa65ae1be71af2a878940 (diff) | |
| parent | e40152ee1e1c7a63f4777791863215e3faa37a86 (diff) | |
Merge commit 'v2.6.34' into next
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) |