2 files changed, 29 insertions, 33 deletions

diff --git a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c
index 72e09eb642dd..bd7426ffedd0 100644
--- a/arch/arm/oprofile/common.c
+++ b/arch/arm/oprofile/common.c
@@ -276,7 +276,7 @@ out:
         return ret;
 }
 
-static void  exit_driverfs(void)
+static void __exit exit_driverfs(void)
 {
         platform_device_unregister(oprofile_pdev);
         platform_driver_unregister(&oprofile_driver);
@@ -352,6 +352,8 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
 {
         int cpu, ret = 0;
 
+        memset(&perf_events, 0, sizeof(perf_events));
+
         perf_num_counters = armpmu_get_max_events();
 
         counter_config = kcalloc(perf_num_counters,
@@ -360,15 +362,13 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
         if (!counter_config) {
                 pr_info("oprofile: failed to allocate %d "
                                 "counters\n", perf_num_counters);
-                return -ENOMEM;
+                ret = -ENOMEM;
+                goto out;
         }
 
         ret = init_driverfs();
-        if (ret) {
-                kfree(counter_config);
-                counter_config = NULL;
-                return ret;
-        }
+        if (ret)
+                goto out;
 
         for_each_possible_cpu(cpu) {
                 perf_events[cpu] = kcalloc(perf_num_counters,
@@ -376,9 +376,8 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
                 if (!perf_events[cpu]) {
                         pr_info("oprofile: failed to allocate %d perf events "
                                         "for cpu %d\n", perf_num_counters, cpu);
-                        while (--cpu >= 0)
-                                kfree(perf_events[cpu]);
-                        return -ENOMEM;
+                        ret = -ENOMEM;
+                        goto out;
                 }
         }
 
@@ -395,29 +394,33 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
         else
                 pr_info("oprofile: using %s\n", ops->cpu_type);
 
+out:
+        if (ret) {
+                for_each_possible_cpu(cpu)
+                        kfree(perf_events[cpu]);
+                kfree(counter_config);
+        }
+
         return ret;
 }
 
-void oprofile_arch_exit(void)
+void __exit oprofile_arch_exit(void)
 {
         int cpu, id;
         struct perf_event *event;
 
-        if (*perf_events) {
-                for_each_possible_cpu(cpu) {
-                        for (id = 0; id < perf_num_counters; ++id) {
-                                event = perf_events[cpu][id];
-                                if (event != NULL)
-                                        perf_event_release_kernel(event);
-                        }
-                        kfree(perf_events[cpu]);
+        for_each_possible_cpu(cpu) {
+                for (id = 0; id < perf_num_counters; ++id) {
+                        event = perf_events[cpu][id];
+                        if (event)
+                                perf_event_release_kernel(event);
                 }
-        }
 
-        if (counter_config) {
-                kfree(counter_config);
-                exit_driverfs();
+                kfree(perf_events[cpu]);
         }
+
+        kfree(counter_config);
+        exit_driverfs();
 }
 #else
 int __init oprofile_arch_init(struct oprofile_operations *ops)
@@ -425,5 +428,5 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
         pr_info("oprofile: hardware counters not available\n");
         return -ENODEV;
 }
-void oprofile_arch_exit(void) {}
+void __exit oprofile_arch_exit(void) {}
 #endif /* CONFIG_HW_PERF_EVENTS */
diff --git a/drivers/oprofile/oprof.c b/drivers/oprofile/oprof.c
index b336cd9ee7a1..b4a685719dba 100644
--- a/drivers/oprofile/oprof.c
+++ b/drivers/oprofile/oprof.c
@@ -257,16 +257,9 @@ static int __init oprofile_init(void)
                 printk(KERN_INFO "oprofile: using timer interrupt.\n");
                 err = oprofile_timer_init(&oprofile_ops);
                 if (err)
-                        goto out_arch;
+                        return err;
         }
-        err = oprofilefs_register();
-        if (err)
-                goto out_arch;
-        return 0;
-
-out_arch:
-        oprofile_arch_exit();
-        return err;
+        return oprofilefs_register();
 }