diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-11-22 22:46:55 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-11-22 22:46:55 +0100 |
| commit | 02f1ce35bed3ceb56868ec534591e15ffdcef879 (patch) | |
| tree | 49b72078598abe3542fb606a3af10dcb7f2d4f3f /net/wireless | |
| parent | tc: comment spelling fixes (diff) | |
| parent | Revert "rt2800pci: handle spurious interrupts" (diff) | |
| download | linux-02f1ce35bed3ceb56868ec534591e15ffdcef879.tar.xz linux-02f1ce35bed3ceb56868ec534591e15ffdcef879.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'net/wireless')
| -rw-r--r-- | net/wireless/reg.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index e71f5a66574e..77e926738014 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -2037,6 +2037,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; |