[ARM] 3295/1: Fix oprofile init return value
Russ Dill [Wed, 1 Feb 2006 21:07:28 +0000 (21:07 +0000)]
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: Russ Dill <Russ.Dill@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

arch/arm/oprofile/common.c

index 1415930..6f8bc1f 100644 (file)
@@ -137,8 +137,9 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
        if (spec) {
                init_MUTEX(&op_arm_sem);
 
-               if (spec->init() < 0)
-                       return -ENODEV;
+               ret = spec->init();
+               if (ret < 0)
+                       return ret;
 
                op_arm_model = spec;
                init_driverfs();