diff options
author | Julien Grall <julien.grall@arm.com> | 2016-05-31 07:41:21 -0400 |
---|---|---|
committer | Will Deacon <will.deacon@arm.com> | 2016-06-03 05:16:20 -0400 |
commit | 121323ae668e456d0ed328f5b77c22bf5dd8e4de (patch) | |
tree | ff3fc3754aedd477965bdf84b8ad1e6017da77e5 | |
parent | 8051f4d16ef1d037e7b12abab79c3e0b960f4d36 (diff) |
drivers/perf: arm_pmu: Fix reference count of a device_node in of_pmu_irq_cfg
The only function called by of_pmu_irq_cfg that will increment the
reference count on dn is of_parse_phandle.
Each time we successfully parse a possible CPU from an
interrupt-affinity property, we increment the refcount of that CPU node
once via of_parse_handle. After validating the CPU is possible, we
decrement the refcount once. Subsequently, we decrement the refcount
again, either as part of an early break if we don't have a matching SPI,
or as part of the end of the loop body.
This will lead to decrementing twice the refcounnt.
Remove the second pairs of call to of_node_put as nobody is using dn
between the first and second call to of_node_put.
Signed-off-by: Julien Grall <julien.grall@arm.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
-rw-r--r-- | drivers/perf/arm_pmu.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c index f2d01d4d9364..6401f0c9fb6e 100644 --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c | |||
@@ -950,17 +950,14 @@ static int of_pmu_irq_cfg(struct arm_pmu *pmu) | |||
950 | 950 | ||
951 | /* For SPIs, we need to track the affinity per IRQ */ | 951 | /* For SPIs, we need to track the affinity per IRQ */ |
952 | if (using_spi) { | 952 | if (using_spi) { |
953 | if (i >= pdev->num_resources) { | 953 | if (i >= pdev->num_resources) |
954 | of_node_put(dn); | ||
955 | break; | 954 | break; |
956 | } | ||
957 | 955 | ||
958 | irqs[i] = cpu; | 956 | irqs[i] = cpu; |
959 | } | 957 | } |
960 | 958 | ||
961 | /* Keep track of the CPUs containing this PMU type */ | 959 | /* Keep track of the CPUs containing this PMU type */ |
962 | cpumask_set_cpu(cpu, &pmu->supported_cpus); | 960 | cpumask_set_cpu(cpu, &pmu->supported_cpus); |
963 | of_node_put(dn); | ||
964 | i++; | 961 | i++; |
965 | } while (1); | 962 | } while (1); |
966 | 963 | ||