]> git.karo-electronics.de Git - linux-beck.git/commitdiff
rtl8xxxu: Init the LLT after we start the firmware
authorJes Sorensen <Jes.Sorensen@redhat.com>
Mon, 29 Feb 2016 22:04:06 +0000 (17:04 -0500)
committerKalle Valo <kvalo@codeaurora.org>
Thu, 10 Mar 2016 13:28:54 +0000 (15:28 +0200)
To match the flow of the vendor driver, move the LLT init to after the
firmware is started.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c

index 65994e938a173a969799d830f91324a9c5170677..ad5b15cb07b6d5fa7afb7fca80f84187b56abacc 100644 (file)
@@ -4342,6 +4342,15 @@ static int rtl8xxxu_init_device(struct ieee80211_hw *hw)
                rtl8xxxu_write8(priv, REG_TDECTRL + 1, val8);
        }
 
+       ret = rtl8xxxu_download_firmware(priv);
+       dev_dbg(dev, "%s: download_fiwmare %i\n", __func__, ret);
+       if (ret)
+               goto exit;
+       ret = rtl8xxxu_start_firmware(priv);
+       dev_dbg(dev, "%s: start_fiwmare %i\n", __func__, ret);
+       if (ret)
+               goto exit;
+
        ret = rtl8xxxu_init_queue_priority(priv);
        dev_dbg(dev, "%s: init_queue_priority %i\n", __func__, ret);
        if (ret)
@@ -4356,15 +4365,6 @@ static int rtl8xxxu_init_device(struct ieee80211_hw *hw)
                }
        }
 
-       ret = rtl8xxxu_download_firmware(priv);
-       dev_dbg(dev, "%s: download_fiwmare %i\n", __func__, ret);
-       if (ret)
-               goto exit;
-       ret = rtl8xxxu_start_firmware(priv);
-       dev_dbg(dev, "%s: start_fiwmare %i\n", __func__, ret);
-       if (ret)
-               goto exit;
-
        ret = rtl8xxxu_init_mac(priv, rtl8723a_mac_init_table);
        dev_dbg(dev, "%s: init_mac %i\n", __func__, ret);
        if (ret)