---

yaml --- r: 211922 b: refs/heads/master c: 8177197 h: refs/heads/master v: v3
git-mirror · Oct 11, 2010 · e08ee85 · e08ee85
1 parent 46b20f9
commit e08ee85
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad0f7cfaa85fc033523a09ab1f3dd6b8ded3dff5
+refs/heads/master: 81771974ae49bf79aab60c42eac7a6d730a9ef2b
diff --git a/trunk/drivers/oprofile/oprofile_perf.c b/trunk/drivers/oprofile/oprofile_perf.c
@@ -84,6 +84,7 @@ static int op_create_counter(int cpu, int event)
 	if (IS_ERR(pevent)) {
 		ret = PTR_ERR(pevent);
 	} else if (pevent->state != PERF_EVENT_STATE_ACTIVE) {
+		perf_event_release_kernel(pevent);
 		pr_warning("oprofile: failed to enable event %d "
 				"on CPU %d\n", event, cpu);
 		ret = -EBUSY;