rtlwifi: Fix fallback firmware loading

commit 1d9b168d8ea9a0f51947d0e2f84856e77d2fe7ff upstream.

Commit f70e4df2b384 ("rtlwifi: Add code to read new versions of
firmware") added code to load an old firmware file if the new one is
not available.  Unfortunately that code is never reached because
request_firmware_nowait() does not wait for the firmware to show up
and returns 0 even if the file is not there.

Use the existing fallback mechanism introduced by commit 62009b7f1279
("rtlwifi: rtl8192cu: Add new firmware") instead.

Fixes: f70e4df2b384 ("rtlwifi: Add code to read new versions of firmware")
Signed-off-by: Sven Joachim <svenjoac@gmx.de>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
index b7a5f9274b468ad8458508d1805ae4f509d0ad1e..81ef1b3124910f46a09d682fcf3ddd37216b0649 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/sw.c
@@ -187,18 +187,10 @@ int rtl8723be_init_sw_vars(struct ieee80211_hw *hw)
                                      rtlpriv->io.dev, GFP_KERNEL, hw,
                                      rtl_fw_cb);
        if (err) {
-               /* Failed to get firmware. Check if old version available */
-               fw_name = "rtlwifi/rtl8723befw.bin";
-               pr_info("Using firmware %s\n", fw_name);
-               err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
-                                             rtlpriv->io.dev, GFP_KERNEL, hw,
-                                             rtl_fw_cb);
-               if (err) {
-                       pr_err("Failed to request firmware!\n");
-                       vfree(rtlpriv->rtlhal.pfirmware);
-                       rtlpriv->rtlhal.pfirmware = NULL;
-                       return 1;
-               }
+               pr_err("Failed to request firmware!\n");
+               vfree(rtlpriv->rtlhal.pfirmware);
+               rtlpriv->rtlhal.pfirmware = NULL;
+               return 1;
        }
        return 0;
 }
@@ -289,6 +281,7 @@ static const struct rtl_hal_cfg rtl8723be_hal_cfg = {
        .bar_id = 2,
        .write_readback = true,
        .name = "rtl8723be_pci",
+       .alt_fw_name = "rtlwifi/rtl8723befw.bin",
        .ops = &rtl8723be_hal_ops,
        .mod_params = &rtl8723be_mod_params,
        .maps[SYS_ISO_CTRL] = REG_SYS_ISO_CTRL,

diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
index 5272fb49f8e1edc2d75dc7f7684fe0e9a71486a1..227d27bed5f652631013d6b2eeeee13c8efc4bce 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
+++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/sw.c
@@ -216,18 +216,10 @@ int rtl8821ae_init_sw_vars(struct ieee80211_hw *hw)
                                      rtlpriv->io.dev, GFP_KERNEL, hw,
                                      rtl_fw_cb);
        if (err) {
-               /* Failed to get firmware. Check if old version available */
-               fw_name = "rtlwifi/rtl8821aefw.bin";
-               pr_info("Using firmware %s\n", fw_name);
-               err = request_firmware_nowait(THIS_MODULE, 1, fw_name,
-                                             rtlpriv->io.dev, GFP_KERNEL, hw,
-                                             rtl_fw_cb);
-               if (err) {
-                       pr_err("Failed to request normal firmware!\n");
-                       vfree(rtlpriv->rtlhal.wowlan_firmware);
-                       vfree(rtlpriv->rtlhal.pfirmware);
-                       return 1;
-               }
+               pr_err("Failed to request normal firmware!\n");
+               vfree(rtlpriv->rtlhal.wowlan_firmware);
+               vfree(rtlpriv->rtlhal.pfirmware);
+               return 1;
        }
        /*load wowlan firmware*/
        pr_info("Using firmware %s\n", wowlan_fw_name);
@@ -331,6 +323,7 @@ static const struct rtl_hal_cfg rtl8821ae_hal_cfg = {
        .bar_id = 2,
        .write_readback = true,
        .name = "rtl8821ae_pci",
+       .alt_fw_name = "rtlwifi/rtl8821aefw.bin",
        .ops = &rtl8821ae_hal_ops,
        .mod_params = &rtl8821ae_mod_params,
        .maps[SYS_ISO_CTRL] = REG_SYS_ISO_CTRL,