From 8d8b051c61fc3d5e9b2aba1dc05d65f2ef914f13 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Tue, 22 Nov 2011 18:01:46 +0000
Subject: [PATCH] --- yaml --- r: 276148 b: refs/heads/master c:
 e5a21327644adba32816f74a415114d11c57f2e9 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/kernel/perf_event.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 3790d424d459..0056e632437c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bce34d14428d35d9a06ddc10cd46ecef311764c9
+refs/heads/master: e5a21327644adba32816f74a415114d11c57f2e9
diff --git a/trunk/arch/arm/kernel/perf_event.c b/trunk/arch/arm/kernel/perf_event.c
index e508066d3d64..c475379199b1 100644
--- a/trunk/arch/arm/kernel/perf_event.c
+++ b/trunk/arch/arm/kernel/perf_event.c
@@ -402,6 +402,9 @@ armpmu_reserve_hardware(struct arm_pmu *armpmu)
 	int i, err, irq, irqs;
 	struct platform_device *pmu_device = armpmu->plat_device;
 
+	if (!pmu_device)
+		return -ENODEV;
+
 	err = reserve_pmu(armpmu->type);
 	if (err) {
 		pr_warning("unable to reserve pmu\n");