From: Robin Murphy <robin.murphy@arm.com>
Date: Fri, 26 Mar 2021 16:02:41 +0000 (+0000)
Subject: perf/arm_pmu_platform: Fix error handling
X-Git-Tag: v4.19.191~392
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=213a9a13f0735212410312f61902a40ff065c477;p=thirdparty%2Fkernel%2Fstable.git

perf/arm_pmu_platform: Fix error handling

[ Upstream commit e338cb6bef254821a8c095018fd27254d74bfd6a ]

If we're aborting after failing to register the PMU device,
we probably don't want to leak the IRQs that we've claimed.

Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/53031a607fc8412a60024bfb3bb8cd7141f998f5.1616774562.git.robin.murphy@arm.com
Signed-off-by: Will Deacon <will@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/drivers/perf/arm_pmu_platform.c b/drivers/perf/arm_pmu_platform.c
index 96075cecb0aec..199293450acfc 100644
--- a/drivers/perf/arm_pmu_platform.c
+++ b/drivers/perf/arm_pmu_platform.c
@@ -236,7 +236,7 @@ int arm_pmu_device_probe(struct platform_device *pdev,
 
 	ret = armpmu_register(pmu);
 	if (ret)
-		goto out_free;
+		goto out_free_irqs;
 
 	return 0;