Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0298dc9f authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

rtlwifi: rtl8192de: Fix firmware initialization 



Before the switch to asynchronous firmware loading (mainline commit b0302aba),
it was necessary to load firmware when initializing the first of the units
in a dual-mac system. After the change, it is necessary to load firmware in
both units.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 2b5f8b0b

drivers/net/wireless/rtlwifi/rtl8192de/sw.c

+0 −6
Original line number Diff line number Diff line
@@ -91,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));

	static int header_print;



	rtlpriv->dm.dm_initialgain_enable = true;

	rtlpriv->dm.dm_flag = 0;
@@ -171,10 +170,6 @@ static int rtl92d_init_sw_vars(struct ieee80211_hw *hw) 
	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) {
@@ -186,7 +181,6 @@ static int rtl92d_init_sw_vars(struct ieee80211_hw *hw) 
	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_nowait(THIS_MODULE, 1, rtlpriv->cfg->fw_name,