1 files changed, 4 insertions, 1 deletions

diff --git a/drivers/bus/arm-ccn.c b/drivers/bus/arm-ccn.c
index d1074d9b38ba..aee83462b796 100644
--- a/drivers/bus/arm-ccn.c
+++ b/drivers/bus/arm-ccn.c
@@ -1570,7 +1570,10 @@ static int __init arm_ccn_init(void)
         for (i = 0; i < ARRAY_SIZE(arm_ccn_pmu_events); i++)
                 arm_ccn_pmu_events_attrs[i] = &arm_ccn_pmu_events[i].attr.attr;
 
-        return platform_driver_register(&arm_ccn_driver);
+        ret = platform_driver_register(&arm_ccn_driver);
+        if (ret)
+                cpuhp_remove_multi_state(CPUHP_AP_PERF_ARM_CCN_ONLINE);
+        return ret;
 }
 
 static void __exit arm_ccn_exit(void)