From f8027639a4d92f357d8cbf0a3686d967b69a3409 Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Thu, 26 Nov 2009 05:35:41 +0100
Subject: [PATCH] --- yaml --- r: 169799 b: refs/heads/master c:
 c6567f642e20bcc79abed030f44be5b0d6da2ded h: refs/heads/master i:   169797:
 5f03d0d887c738efddc8ba02f90a82ed2dc21f60   169795:
 69e22e0af95719d54f1d61730ff52809d5c8a360   169791:
 c3074e26ae2613ba5a475dbd4ee6ee42991c46af v: v3

---
 [refs]                    |  2 +-
 trunk/kernel/perf_event.c | 20 +++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 28529a8548d7..fc9bd3bccc52 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d99be40aff88722ab03ee295e4f6c13a4cca9a3d
+refs/heads/master: c6567f642e20bcc79abed030f44be5b0d6da2ded
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
index 35df94e344f2..34a1b9d7633e 100644
--- a/trunk/kernel/perf_event.c
+++ b/trunk/kernel/perf_event.c
@@ -4780,14 +4780,17 @@ perf_event_create_kernel_counter(struct perf_event_attr *attr, int cpu,
 	 */
 
 	ctx = find_get_context(pid, cpu);
-	if (IS_ERR(ctx))
-		return NULL;
+	if (IS_ERR(ctx)) {
+		err = PTR_ERR(ctx);
+		goto err_exit;
+	}
 
 	event = perf_event_alloc(attr, cpu, ctx, NULL,
 				     NULL, callback, GFP_KERNEL);
-	err = PTR_ERR(event);
-	if (IS_ERR(event))
+	if (IS_ERR(event)) {
+		err = PTR_ERR(event);
 		goto err_put_context;
+	}
 
 	event->filp = NULL;
 	WARN_ON_ONCE(ctx->parent_ctx);
@@ -4804,11 +4807,10 @@ perf_event_create_kernel_counter(struct perf_event_attr *attr, int cpu,
 
 	return event;
 
-err_put_context:
-	if (err < 0)
-		put_ctx(ctx);
-
-	return NULL;
+ err_put_context:
+	put_ctx(ctx);
+ err_exit:
+	return ERR_PTR(err);
 }
 EXPORT_SYMBOL_GPL(perf_event_create_kernel_counter);