From 34cda7f4942277983bb9f41797f562926c811af9 Mon Sep 17 00:00:00 2001
From: Russ Dill <Russ.Dill@gmail.com>
Date: Wed, 1 Feb 2006 21:07:28 +0000
Subject: [PATCH] --- yaml --- r: 19727 b: refs/heads/master c:
 7610dfa3723e87705964b29db9775620d96bf618 h: refs/heads/master i:   19725:
 4fff17b05c66f09c0bf6bdcb266c372aac96cf7c   19723:
 5dafb13965391d80c15caf56d086dd27650f5549   19719:
 e468abb705bc34b0e8e5bcd406796c54410a10b7   19711:
 50248d81cf2bd0d329cff757464c69e4168b8091 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/arm/oprofile/common.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5334b780b56a..a09e461e5898 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 18afea04f1dfc5d52fd2579cd17adc3956acd4ad
+refs/heads/master: 7610dfa3723e87705964b29db9775620d96bf618
diff --git a/trunk/arch/arm/oprofile/common.c b/trunk/arch/arm/oprofile/common.c
index 1415930ceee1..6f8bc1f0e6a1 100644
--- a/trunk/arch/arm/oprofile/common.c
+++ b/trunk/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();