summaryrefslogtreecommitdiffstats
path: root/drivers/perf/marvell_cn10k_tad_pmu.c
diff options
context:
space:
mode:
authorYuan Can <yuancan@huawei.com>2022-11-15 07:02:07 +0000
committerWill Deacon <will@kernel.org>2022-11-15 13:45:02 +0000
commit973ae93d80d9d262f695eb485a1902b74c4b9098 (patch)
tree98677729b80358600a94554949efe991582b9317 /drivers/perf/marvell_cn10k_tad_pmu.c
parentfacafab7611f7b872c6b9eeaff53461ef11f482e (diff)
downloadlinux-973ae93d80d9d262f695eb485a1902b74c4b9098.tar.bz2
drivers: perf: marvell_cn10k: Fix hotplug callback leak in tad_pmu_init()
tad_pmu_init() won't remove the callback added by cpuhp_setup_state_multi() when platform_driver_register() failed. Remove the callback by cpuhp_remove_multi_state() in fail path. Similar to the handling of arm_ccn_init() in commit 26242b330093 ("bus: arm-ccn: Prevent hotplug callback leak") Fixes: 036a7584bede ("drivers: perf: Add LLC-TAD perf counter support") Signed-off-by: Yuan Can <yuancan@huawei.com> Link: https://lore.kernel.org/r/20221115070207.32634-3-yuancan@huawei.com Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'drivers/perf/marvell_cn10k_tad_pmu.c')
-rw-r--r--drivers/perf/marvell_cn10k_tad_pmu.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/perf/marvell_cn10k_tad_pmu.c b/drivers/perf/marvell_cn10k_tad_pmu.c
index 69c3050a4348..a1166afb3702 100644
--- a/drivers/perf/marvell_cn10k_tad_pmu.c
+++ b/drivers/perf/marvell_cn10k_tad_pmu.c
@@ -408,7 +408,11 @@ static int __init tad_pmu_init(void)
if (ret < 0)
return ret;
tad_pmu_cpuhp_state = ret;
- return platform_driver_register(&tad_pmu_driver);
+ ret = platform_driver_register(&tad_pmu_driver);
+ if (ret)
+ cpuhp_remove_multi_state(tad_pmu_cpuhp_state);
+
+ return ret;
}
static void __exit tad_pmu_exit(void)