Explorar o código

[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: Russ Dill <Russ.Dill@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Russ Dill %!s(int64=19) %!d(string=hai) anos
pai
achega
7610dfa372
Modificáronse 1 ficheiros con 3 adicións e 2 borrados
  1. 3 2
      arch/arm/oprofile/common.c

+ 3 - 2
arch/arm/oprofile/common.c

@@ -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();