From d4e8a34e3848f2bd4e3a7b5f33c45dc566a58486 Mon Sep 17 00:00:00 2001
From: Mark Rutland <Mark.Rutland@arm.com>
Date: Fri, 18 Jan 2013 13:42:58 +0000
Subject: [PATCH] --- yaml --- r: 351164 b: refs/heads/master c:
 76b8a0e4c8bda5f03574b8a904331266d162c796 h: refs/heads/master v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/arm/kernel/perf_event_cpu.c | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index e38367b0afb8..ee728d403199 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40c390c768f898497e17d934f6715d516ff67294
+refs/heads/master: 76b8a0e4c8bda5f03574b8a904331266d162c796
diff --git a/trunk/arch/arm/kernel/perf_event_cpu.c b/trunk/arch/arm/kernel/perf_event_cpu.c
index 43496f600569..1f2740e3dbc0 100644
--- a/trunk/arch/arm/kernel/perf_event_cpu.c
+++ b/trunk/arch/arm/kernel/perf_event_cpu.c
@@ -277,17 +277,22 @@ static int cpu_pmu_device_probe(struct platform_device *pdev)
 	}
 
 	if (ret) {
-		pr_info("failed to register PMU devices!");
-		kfree(pmu);
-		return ret;
+		pr_info("failed to probe PMU!");
+		goto out_free;
 	}
 
 	cpu_pmu = pmu;
 	cpu_pmu->plat_device = pdev;
 	cpu_pmu_init(cpu_pmu);
-	armpmu_register(cpu_pmu, PERF_TYPE_RAW);
+	ret = armpmu_register(cpu_pmu, PERF_TYPE_RAW);
 
-	return 0;
+	if (!ret)
+		return 0;
+
+out_free:
+	pr_info("failed to register PMU devices!");
+	kfree(pmu);
+	return ret;
 }
 
 static struct platform_driver cpu_pmu_driver = {