aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/broadcom-wl/patches/007-use-glue-driver.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2013-11-11 22:03:58 +0000
committerHauke Mehrtens <hauke@openwrt.org>2013-11-11 22:03:58 +0000
commite3fa6d1b8ffbd2ee8502c85a3e807f07edf40246 (patch)
tree6dbec4eeffffaea98162d53f64f603c13594a4c4 /package/kernel/broadcom-wl/patches/007-use-glue-driver.patch
parent0b335e2ac296020601ff31dadb7cd9ed66a7c686 (diff)
downloadmaster-187ad058-e3fa6d1b8ffbd2ee8502c85a3e807f07edf40246.tar.gz
master-187ad058-e3fa6d1b8ffbd2ee8502c85a3e807f07edf40246.tar.bz2
master-187ad058-e3fa6d1b8ffbd2ee8502c85a3e807f07edf40246.zip
broadcom-wl: perform additional cleanup on wl module unload
Signed-off-by: Nathan Hintz <nlhintz@hotmail.com> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38761 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/kernel/broadcom-wl/patches/007-use-glue-driver.patch')
-rw-r--r--package/kernel/broadcom-wl/patches/007-use-glue-driver.patch8
1 files changed, 6 insertions, 2 deletions
diff --git a/package/kernel/broadcom-wl/patches/007-use-glue-driver.patch b/package/kernel/broadcom-wl/patches/007-use-glue-driver.patch
index 2639abcf6a..a30dcc4edf 100644
--- a/package/kernel/broadcom-wl/patches/007-use-glue-driver.patch
+++ b/package/kernel/broadcom-wl/patches/007-use-glue-driver.patch
@@ -108,18 +108,20 @@
#ifdef CONFIG_PCI
error = pci_register_driver(&wl_pci_driver);
-@@ -1082,7 +1053,9 @@ wl_module_init(void)
+@@ -1082,7 +1053,11 @@ wl_module_init(void)
return 0;
error_pci:
- ssb_driver_unregister(&wl_ssb_driver);
+#if defined(CONFIG_SSB) || defined(CONFIG_BCMA)
+ wl_glue_unregister();
++ wl_glue_set_attach_callback(NULL);
++ wl_glue_set_remove_callback(NULL);
+#endif /* defined(CONFIG_SSB) || defined(CONFIG_BCMA) */
return error;
}
-@@ -1099,9 +1072,9 @@ wl_module_exit(void)
+@@ -1099,9 +1074,11 @@ wl_module_exit(void)
#ifdef CONFIG_PCI
pci_unregister_driver(&wl_pci_driver);
#endif /* CONFIG_PCI */
@@ -128,6 +130,8 @@
-#endif /* CONFIG_SSB */
+#if defined(CONFIG_SSB) || defined(CONFIG_BCMA)
+ wl_glue_unregister();
++ wl_glue_set_attach_callback(NULL);
++ wl_glue_set_remove_callback(NULL);
+#endif /* defined(CONFIG_SSB) || defined(CONFIG_BCMA) */
}