Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...

[cascardo/linux.git] / drivers / perf / arm_pmu.c

diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c
index 77ac1cc..3037081 100644 (file)
--- a/drivers/perf/arm_pmu.c
+++ b/drivers/perf/arm_pmu.c
@@ -946,6 +946,7 @@ static int of_pmu_irq_cfg(struct arm_pmu *pmu)
                        if (i > 0 && spi != using_spi) {
                                pr_err("PPI/SPI IRQ type mismatch for %s!\n",
                                        dn->name);
+                               of_node_put(dn);
                                kfree(irqs);
                                return -EINVAL;
                        }
@@ -991,6 +992,7 @@ static int of_pmu_irq_cfg(struct arm_pmu *pmu)
                int irq = platform_get_irq(pdev, 0);
 
                if (irq > 0 && irq_is_percpu(irq)) {
+                       /* If using PPIs, check the affinity of the partition */
                        int ret;
 
                        ret = irq_get_percpu_devid_partition(irq, &pmu->supported_cpus);