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: