Commit 7610dfa3 authored Feb 01, 2006 by Russ Dill Committed by Russell King Feb 01, 2006

[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>

parent 18afea04

arch/arm/oprofile/common.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -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();