From 22d8c2f248e107c4279954facdcadaeee43e60c2 Mon Sep 17 00:00:00 2001
From: Paul Mackerras <paulus@samba.org>
Date: Sat, 8 May 2010 20:58:00 +1000
Subject: [PATCH] --- yaml --- r: 191303 b: refs/heads/master c:
 6e85158cf5a2385264316870256fb6ad681156a0 h: refs/heads/master i:   191301:
 d299d9d841c913342ac32fffa968046ad149ad74   191299:
 eccd9e46216ce1f0cb9a7fdcb195f24399f4bd82   191295:
 0d5e83c79668300bf3b3b88247b9d6dfcda2528e v: v3

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

diff --git a/[refs] b/[refs]
index bf64f9ee73e1..24eae4d8c03b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ed82702155b6343727ee732f7eae6d72e8b453fe
+refs/heads/master: 6e85158cf5a2385264316870256fb6ad681156a0
diff --git a/trunk/kernel/perf_event.c b/trunk/kernel/perf_event.c
index bb06382f98e7..180151ff8376 100644
--- a/trunk/kernel/perf_event.c
+++ b/trunk/kernel/perf_event.c
@@ -664,13 +664,13 @@ group_sched_in(struct perf_event *group_event,
 		}
 	}
 
-	if (txn) {
-		ret = pmu->commit_txn(pmu);
-		if (!ret) {
-			pmu->cancel_txn(pmu);
+	if (!txn)
+		return 0;
 
-			return 0;
-		}
+	ret = pmu->commit_txn(pmu);
+	if (!ret) {
+		pmu->cancel_txn(pmu);
+		return 0;
 	}
 
 group_error: