diff --git a/[refs] b/[refs] index 5d2cdb6d6e5b..9018ddcbaadc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9c8f2c42c93f415771d6d7b87a0881ba0bb72824 +refs/heads/master: de3584bd62d87b4c250129fbc46ca52c80330add diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c index bc1ec2c26fd0..186b7f2a27b6 100644 --- a/trunk/net/wireless/reg.c +++ b/trunk/net/wireless/reg.c @@ -2035,6 +2035,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(); + return -ENODEV; + } if (!last_request->intersect) { int r;