summaryrefslogtreecommitdiff
path: root/net/wireless
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-11-11 11:34:47 -0500
committerJohn W. Linville <linville@tuxdriver.com>2011-11-11 11:34:47 -0500
commitfb14ca438c0a54306419ee648d9d146c5e7be679 (patch)
tree5a4a434461fceb2586a250e702838264431c7f3d /net/wireless
parent1e49570171117e547e6324c58371db4a0dc2f1db (diff)
parentfada10584d3890258e59da73728510ad7e08a033 (diff)
downloadkernel-common-fb14ca438c0a54306419ee648d9d146c5e7be679.tar.gz
kernel-common-fb14ca438c0a54306419ee648d9d146c5e7be679.tar.bz2
kernel-common-fb14ca438c0a54306419ee648d9d146c5e7be679.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.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 6acba9d18cc8..e71f5a66574e 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -2265,6 +2265,9 @@ void /* __init_or_exit */ regulatory_exit(void)
kfree(last_request);
+ last_request = NULL;
+ dev_set_uevent_suppress(&reg_pdev->dev, true);
+
platform_device_unregister(reg_pdev);
spin_lock_bh(&reg_pending_beacons_lock);