1 files changed, 16 insertions, 14 deletions

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index c4da05817443..2a1e5ae0c402 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -1181,27 +1181,29 @@ exit:
 }
 #endif                          /* DEBUG */
 
-static int __init brcmfmac_init(void)
+static void brcmf_driver_init(struct work_struct *work)
 {
-        int ret = 0;
-
 #ifdef CONFIG_BRCMFMAC_SDIO
-        ret = brcmf_sdio_init();
-        if (ret)
-                goto fail;
+        brcmf_sdio_init();
 #endif
 #ifdef CONFIG_BRCMFMAC_USB
-        ret = brcmf_usb_init();
-        if (ret)
-                goto fail;
+        brcmf_usb_init();
 #endif
+}
+static DECLARE_WORK(brcmf_driver_work, brcmf_driver_init);
 
-fail:
-        return ret;
+static int __init brcmfmac_module_init(void)
+{
+        if (!schedule_work(&brcmf_driver_work))
+                return -EBUSY;
+
+        return 0;
 }
 
-static void __exit brcmfmac_exit(void)
+static void __exit brcmfmac_module_exit(void)
 {
+        cancel_work_sync(&brcmf_driver_work);
+
 #ifdef CONFIG_BRCMFMAC_SDIO
         brcmf_sdio_exit();
 #endif
@@ -1210,5 +1212,5 @@ static void __exit brcmfmac_exit(void)
 #endif
 }
 
-module_init(brcmfmac_init);
-module_exit(brcmfmac_exit);
+module_init(brcmfmac_module_init);
+module_exit(brcmfmac_module_exit);