diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:29:00 -0500 |
| commit | 9caafa6c8686e319cf4d5f3757b3972c6c522b7c (patch) | |
| tree | b38979b835b5d22e681b175d0b98a3c7560d9c59 /arch/arm/oprofile/common.c | |
| parent | 51e9f2ff83df6b1c81c5c44f4486c68ed87aa20e (diff) | |
| parent | cac0e8e8bb2e7a086643bdd00c41d900a79bb4fa (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/arm/oprofile/common.c')
| -rw-r--r-- | arch/arm/oprofile/common.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c index 1415930ceee1..6f8bc1f0e6a1 100644 --- a/arch/arm/oprofile/common.c +++ b/arch/arm/oprofile/common.c | |||
| @@ -137,8 +137,9 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) | |||
| 137 | if (spec) { | 137 | if (spec) { |
| 138 | init_MUTEX(&op_arm_sem); | 138 | init_MUTEX(&op_arm_sem); |
| 139 | 139 | ||
| 140 | if (spec->init() < 0) | 140 | ret = spec->init(); |
| 141 | return -ENODEV; | 141 | if (ret < 0) |
| 142 | return ret; | ||
| 142 | 143 | ||
| 143 | op_arm_model = spec; | 144 | op_arm_model = spec; |
| 144 | init_driverfs(); | 145 | init_driverfs(); |