---

yaml --- r: 147309 b: refs/heads/master c: 9ea98e1 h: refs/heads/master i: 147307: eb64b76 v: v3
git-mirror · Apr 6, 2009 · 96f7e58 · 96f7e58
1 parent 5092bdb
commit 96f7e58
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5d2bc0dd0379deddb9ede66fec90a3083eaec57
+refs/heads/master: 9ea98e191255ee642e64a5745014424fc63f83b0
diff --git a/trunk/arch/x86/kernel/cpu/perf_counter.c b/trunk/arch/x86/kernel/cpu/perf_counter.c
@@ -954,7 +954,7 @@ hw_perf_counter_init(struct perf_counter *counter)
 
 	err = __hw_perf_counter_init(counter);
 	if (err)
-		return NULL;
+		return ERR_PTR(err);
 
 	return &x86_perf_counter_ops;
 }