1 files changed, 4 insertions, 2 deletions

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 0ec40715a67b..074c1122ce42 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -2049,8 +2049,10 @@ static int __set_regdom(const struct ieee80211_regdomain *rd)
         }
 
         request_wiphy = wiphy_idx_to_wiphy(last_request->wiphy_idx);
-        if (!request_wiphy) {
-                reg_set_request_processed();
+        if (!request_wiphy &&
+            (last_request->initiator == NL80211_REGDOM_SET_BY_DRIVER ||
+             last_request->initiator == NL80211_REGDOM_SET_BY_COUNTRY_IE)) {
+                schedule_delayed_work(&reg_timeout, 0);
                 return -ENODEV;
         }