diff options
| author | luanshi <zhangliguang@linux.alibaba.com> | 2020-02-26 13:45:10 +0800 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2020-03-02 12:07:35 +0000 |
| commit | 3ba52ad55b533760a1f65836aa0ec9d35e36bb4f (patch) | |
| tree | e8a2e685ca1660789d369cf830eb803321c70955 /drivers | |
| parent | 049d919168458ac54e7fad27cd156a958b042d2f (diff) | |
| download | linux-stable-3ba52ad55b533760a1f65836aa0ec9d35e36bb4f.tar.gz linux-stable-3ba52ad55b533760a1f65836aa0ec9d35e36bb4f.tar.bz2 linux-stable-3ba52ad55b533760a1f65836aa0ec9d35e36bb4f.zip | |
drivers/perf: arm_pmu_acpi: Fix incorrect checking of gicc pointer
Fix bogus NULL checks on the return value of acpi_cpu_get_madt_gicc()
by checking for a 0 'gicc->performance_interrupt' value instead.
Signed-off-by: Liguang Zhang <zhangliguang@linux.alibaba.com>
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/perf/arm_pmu_acpi.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/perf/arm_pmu_acpi.c b/drivers/perf/arm_pmu_acpi.c index acce8781c456..f5c7a845cd7b 100644 --- a/drivers/perf/arm_pmu_acpi.c +++ b/drivers/perf/arm_pmu_acpi.c @@ -24,8 +24,6 @@ static int arm_pmu_acpi_register_irq(int cpu) int gsi, trigger; gicc = acpi_cpu_get_madt_gicc(cpu); - if (WARN_ON(!gicc)) - return -EINVAL; gsi = gicc->performance_interrupt; @@ -64,11 +62,10 @@ static void arm_pmu_acpi_unregister_irq(int cpu) int gsi; gicc = acpi_cpu_get_madt_gicc(cpu); - if (!gicc) - return; gsi = gicc->performance_interrupt; - acpi_unregister_gsi(gsi); + if (gsi) + acpi_unregister_gsi(gsi); } #if IS_ENABLED(CONFIG_ARM_SPE_PMU) |