Commit 7610dfa3 authored by Russ Dill's avatar Russ Dill Committed by Russell King

[ARM] 3295/1: Fix oprofile init return value

Patch from Russ Dill

The oprofile init code was broken in commit c6b9da. The new logic will
always return -ENODEV. This fixes oprofile_arch_init to return 0 on
success, and return the return value of spec->init() if applicable.
Signed-off-by: default avatarRuss Dill <Russ.Dill@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 18afea04
...@@ -137,8 +137,9 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) ...@@ -137,8 +137,9 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
if (spec) { if (spec) {
init_MUTEX(&op_arm_sem); init_MUTEX(&op_arm_sem);
if (spec->init() < 0) ret = spec->init();
return -ENODEV; if (ret < 0)
return ret;
op_arm_model = spec; op_arm_model = spec;
init_driverfs(); init_driverfs();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment