---

yaml --- r: 191303 b: refs/heads/master c: 6e85158 h: refs/heads/master i: 191301: d299d9d 191299: eccd9e4 191295: 0d5e83c v: v3
git-mirror · May 8, 2010 · 22d8c2f · 22d8c2f
1 parent 04fc394
commit 22d8c2f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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: