+@@ -539,6 +554,11 @@ void ath_reg_notifier_apply(struct wiphy
+ ath_reg_dyn_country(wiphy, reg, request);
+ break;
+ }
++
++ /* Prevent broken CTLs from being applied */
++ if (IS_ENABLED(CPTCFG_ATH_USER_REGD) &&
++ reg->regpair != common->reg_world_copy.regpair)
++ reg->regpair = ath_get_regpair(WOR0_WORLD);
+ }
+ EXPORT_SYMBOL(ath_reg_notifier_apply);
+
+@@ -634,6 +654,10 @@ ath_regd_init_wiphy(struct ath_regulator