| Message ID | 1582695910-46288-1-git-send-email-zhangliguang@linux.alibaba.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 3ba52ad55b533760a1f65836aa0ec9d35e36bb4f |
| Headers | show |
| Series | arm_pmu: acpi: Fix incorrect checks of gicc | expand |
diff --git a/drivers/perf/arm_pmu_acpi.c b/drivers/perf/arm_pmu_acpi.c index acce878..f5c7a84 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)
Fix incorrect checks of NULL pointer gicc. Signed-off-by: Liguang Zhang <zhangliguang@linux.alibaba.com> --- drivers/perf/arm_pmu_acpi.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)