1 files changed, 25 insertions, 32 deletions

diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/sw.c b/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
index 7911c9c87085..4898c502974d 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/sw.c
@@ -1,6 +1,6 @@
 /******************************************************************************
  *
- * Copyright(c) 2009-2010  Realtek Corporation.
+ * Copyright(c) 2009-2012  Realtek Corporation.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
@@ -27,11 +27,6 @@
  *
  *****************************************************************************/
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/vmalloc.h>
-#include <linux/module.h>
-
 #include "../wifi.h"
 #include "../core.h"
 #include "../pci.h"
@@ -44,6 +39,8 @@
 #include "trx.h"
 #include "led.h"
 
+#include <linux/module.h>
+
 static void rtl92d_init_aspm_vars(struct ieee80211_hw *hw)
 {
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
@@ -94,7 +91,6 @@ static int rtl92d_init_sw_vars(struct ieee80211_hw *hw)
         u8 tid;
         struct rtl_priv *rtlpriv = rtl_priv(hw);
         struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
-        const struct firmware *firmware;
         static int header_print;
 
         rtlpriv->dm.dm_initialgain_enable = true;
@@ -154,9 +150,9 @@ static int rtl92d_init_sw_vars(struct ieee80211_hw *hw)
         rtlpriv->psc.swctrl_lps = rtlpriv->cfg->mod_params->swctrl_lps;
         rtlpriv->psc.fwctrl_lps = rtlpriv->cfg->mod_params->fwctrl_lps;
         if (!rtlpriv->psc.inactiveps)
-                pr_info("rtl8192ce: Power Save off (module option)\n");
+                pr_info("Power Save off (module option)\n");
         if (!rtlpriv->psc.fwctrl_lps)
-                pr_info("rtl8192ce: FW Power Save off (module option)\n");
+                pr_info("FW Power Save off (module option)\n");
         rtlpriv->psc.reg_fwctrl_lps = 3;
         rtlpriv->psc.reg_max_lps_awakeintvl = 5;
         /* for ASPM, you can close aspm through
@@ -170,41 +166,38 @@ static int rtl92d_init_sw_vars(struct ieee80211_hw *hw)
         else if (rtlpriv->psc.reg_fwctrl_lps == 3)
                 rtlpriv->psc.fwctrl_psmode = FW_PS_DTIM_MODE;
 
+        /* for early mode */
+        rtlpriv->rtlhal.earlymode_enable = true;
+        for (tid = 0; tid < 8; tid++)
+                skb_queue_head_init(&rtlpriv->mac80211.skb_waitq[tid]);
+
+        /* Only load firmware for first MAC */
+        if (header_print)
+                return 0;
+
         /* for firmware buf */
         rtlpriv->rtlhal.pfirmware = vzalloc(0x8000);
         if (!rtlpriv->rtlhal.pfirmware) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Can't alloc buffer for fw.\n"));
+                         "Can't alloc buffer for fw\n");
                 return 1;
         }
 
-        if (!header_print) {
-                pr_info("Driver for Realtek RTL8192DE WLAN interface\n");
-                pr_info("Loading firmware file %s\n", rtlpriv->cfg->fw_name);
-                header_print++;
-        }
+        rtlpriv->max_fw_size = 0x8000;
+        pr_info("Driver for Realtek RTL8192DE WLAN interface\n");
+        pr_info("Loading firmware file %s\n", rtlpriv->cfg->fw_name);
+        header_print++;
+
         /* request fw */
-        err = request_firmware(&firmware, rtlpriv->cfg->fw_name,
-                               rtlpriv->io.dev);
+        err = request_firmware_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name,
+                                      rtlpriv->io.dev, GFP_KERNEL, hw,
+                                      rtl_fw_cb);
         if (err) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Failed to request firmware!\n"));
-                return 1;
-        }
-        if (firmware->size > 0x8000) {
-                RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
-                         ("Firmware is too big!\n"));
-                release_firmware(firmware);
+                         "Failed to request firmware!\n");
                 return 1;
         }
-        memcpy(rtlpriv->rtlhal.pfirmware, firmware->data, firmware->size);
-        rtlpriv->rtlhal.fwsize = firmware->size;
-        release_firmware(firmware);
 
-        /* for early mode */
-        rtlpriv->rtlhal.earlymode_enable = true;
-        for (tid = 0; tid < 8; tid++)
-                skb_queue_head_init(&rtlpriv->mac80211.skb_waitq[tid]);
         return 0;
 }
 
@@ -424,7 +417,7 @@ static int __init rtl92de_module_init(void)
 
         ret = pci_register_driver(&rtl92de_driver);
         if (ret)
-                RT_ASSERT(false, (": No device found\n"));
+                RT_ASSERT(false, "No device found\n");
         return ret;
 }