cfg80211: reg: remove useless reg_timeout scheduling

When the functions reg_set_rd_driver() and reg_set_rd_country_ie()
return with an error, the calling function already restores data
by calling restore_regulatory_settings(), so there's no need to
also schedule a timeout (which would lead to other side effects
such as indicating CRDA failed, which clearly isn't true.) Remove
the scheduling.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index bc29c9a754a557b05d604a90b841a8eebe3b3394..3b3119fa87aedd74df63528f987596481a2246ac 100644 (file)
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -2884,11 +2884,8 @@ static int reg_set_rd_driver(const struct ieee80211_regdomain *rd,
        }
 
        request_wiphy = wiphy_idx_to_wiphy(driver_request->wiphy_idx);
-       if (!request_wiphy) {
-               queue_delayed_work(system_power_efficient_wq,
-                                  &reg_timeout, 0);
+       if (!request_wiphy)
                return -ENODEV;
-       }
 
        if (!driver_request->intersect) {
                if (request_wiphy->regd)
@@ -2945,11 +2942,8 @@ static int reg_set_rd_country_ie(const struct ieee80211_regdomain *rd,
        }
 
        request_wiphy = wiphy_idx_to_wiphy(country_ie_request->wiphy_idx);
-       if (!request_wiphy) {
-               queue_delayed_work(system_power_efficient_wq,
-                                  &reg_timeout, 0);
+       if (!request_wiphy)
                return -ENODEV;
-       }
 
        if (country_ie_request->intersect)
                return -EINVAL;