rtlwifi: rtl8192cu: Add new firmware

Vendor driver rtl8188C_8192C_8192D_usb_linux_v3.4.2_3727.20120404 introduced
new firmware for these chips. The code try for the new file, and fall back to
the original firmware if the new file is not available.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Stable <stable@vger.kernel.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 10 insertions, 0 deletions

diff --git a/drivers/net/wireless/rtlwifi/core.c b/drivers/net/wireless/rtlwifi/core.c
index 210ce7cd94d8..8dc4d9308593 100644
--- a/drivers/net/wireless/rtlwifi/core.c
+++ b/drivers/net/wireless/rtlwifi/core.c
@@ -46,10 +46,20 @@ void rtl_fw_cb(const struct firmware *firmware, void *context)
                          "Firmware callback routine entered!\n");
         complete(&rtlpriv->firmware_loading_complete);
         if (!firmware) {
+                if (rtlpriv->cfg->alt_fw_name) {
+                        err = request_firmware(&firmware,
+                                               rtlpriv->cfg->alt_fw_name,
+                                               rtlpriv->io.dev);
+                        pr_info("Loading alternative firmware %s\n",
+                                rtlpriv->cfg->alt_fw_name);
+                        if (!err)
+                                goto found_alt;
+                }
                 pr_err("Firmware %s not available\n", rtlpriv->cfg->fw_name);
                 rtlpriv->max_fw_size = 0;
                 return;
         }
+found_alt:
         if (firmware->size > rtlpriv->max_fw_size) {
                 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
                          "Firmware is too big!\n");