diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2009-03-30 13:07:09 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-04-06 03:30:40 -0400 |
commit | 9ea98e191255ee642e64a5745014424fc63f83b0 (patch) | |
tree | 6a52beba7fdc8824f1e607be08dc7805dbea1874 /arch | |
parent | d5d2bc0dd0379deddb9ede66fec90a3083eaec57 (diff) |
perf_counter: x86: proper error propagation for the x86 hw_perf_counter_init()
Now that Paul cleaned up the error propagation paths, pass down the
x86 error as well.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Acked-by: Paul Mackerras <paulus@samba.org>
Orig-LKML-Reference: <20090330171023.792822360@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/cpu/perf_counter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/perf_counter.c b/arch/x86/kernel/cpu/perf_counter.c index 7aab177fb566..b8885ccd8049 100644 --- a/arch/x86/kernel/cpu/perf_counter.c +++ b/arch/x86/kernel/cpu/perf_counter.c | |||
@@ -954,7 +954,7 @@ hw_perf_counter_init(struct perf_counter *counter) | |||
954 | 954 | ||
955 | err = __hw_perf_counter_init(counter); | 955 | err = __hw_perf_counter_init(counter); |
956 | if (err) | 956 | if (err) |
957 | return NULL; | 957 | return ERR_PTR(err); |
958 | 958 | ||
959 | return &x86_perf_counter_ops; | 959 | return &x86_perf_counter_ops; |
960 | } | 960 | } |