Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a3967ed authored by Stephen Boyd's avatar Stephen Boyd Committed by Will Deacon
Browse files

ARM: perf: assign pdev pointer earlier for CPU PMUs 



We want to inspect the of_node that the pdev is pointing to in
the Krait CPU specific PMU initialization function. Assign it
earlier so that we don't crash with a NULL pointer dereference.

Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent bbd64559

arch/arm/kernel/perf_event_cpu.c

+3 −2
Original line number Diff line number Diff line
@@ -311,6 +311,9 @@ static int cpu_pmu_device_probe(struct platform_device *pdev) 
		return -ENOMEM;

	}



	cpu_pmu = pmu;

	cpu_pmu->plat_device = pdev;



	if (node && (of_id = of_match_node(cpu_pmu_of_device_ids, pdev->dev.of_node))) {

		init_fn = of_id->data;

		ret = init_fn(pmu);
@@ -323,8 +326,6 @@ static int cpu_pmu_device_probe(struct platform_device *pdev) 
		goto out_free;

	}



	cpu_pmu = pmu;

	cpu_pmu->plat_device = pdev;

	cpu_pmu_init(cpu_pmu);

	ret = armpmu_register(cpu_pmu, PERF_TYPE_RAW);