1 files changed, 10 insertions, 19 deletions

diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
index c04c3be5bd4e..82c85286ab2e 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c
@@ -53,7 +53,6 @@ MODULE_FIRMWARE("rtlwifi/rtl8192cufw.bin");
 static int rtl92cu_init_sw_vars(struct ieee80211_hw *hw)
 {
         struct rtl_priv *rtlpriv = rtl_priv(hw);
-        const struct firmware *firmware;
         int err;
 
         rtlpriv->dm.dm_initialgain_enable = true;
@@ -61,29 +60,21 @@ static int rtl92cu_init_sw_vars(struct ieee80211_hw *hw)
         rtlpriv->dm.disable_framebursting = false;
         rtlpriv->dm.thermalvalue = 0;
         rtlpriv->dbg.global_debuglevel = rtlpriv->cfg->mod_params->debug;
-        rtlpriv->rtlhal.pfirmware = vmalloc(0x4000);
+
+        /* for firmware buf */
+        rtlpriv->rtlhal.pfirmware = vzalloc(0x4000);
         if (!rtlpriv->rtlhal.pfirmware) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
                          "Can't alloc buffer for fw\n");
                 return 1;
         }
-        /* request fw */
-        err = request_firmware(&firmware, rtlpriv->cfg->fw_name,
-                        rtlpriv->io.dev);
-        if (err) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         "Failed to request firmware!\n");
-                return 1;
-        }
-        if (firmware->size > 0x4000) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         "Firmware is too big!\n");
-                release_firmware(firmware);
-                return 1;
-        }
-        memcpy(rtlpriv->rtlhal.pfirmware, firmware->data, firmware->size);
-        rtlpriv->rtlhal.fwsize = firmware->size;
-        release_firmware(firmware);
+
+        pr_info("Loading firmware %s\n", rtlpriv->cfg->fw_name);
+        rtlpriv->max_fw_size = 0x4000;
+        err = request_firmware_nowait(THIS_MODULE, 1,
+                                      rtlpriv->cfg->fw_name, rtlpriv->io.dev,
+                                      GFP_KERNEL, hw, rtl_fw_cb);
+
 
         return 0;
 }