---

yaml --- r: 276148 b: refs/heads/master c: e5a2132 h: refs/heads/master v: v3
git-mirror · Nov 22, 2011 · 8d8b051 · 8d8b051
1 parent 6bf2785
commit 8d8b051
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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");