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

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

rtlwifi: rtl8192se: Fix duplicate calls to ieee80211_register_hw() 



Driver rtlwifi has been modified to call ieee80211_register_hw()
from the probe routine; however, the existing call in the callback
routine for deferred firmware loading was not removed.

Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: Murilo Opsfelder Araujo <mopsfelder@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c0386f15

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

+0 −17
Original line number Diff line number Diff line
@@ -87,11 +87,8 @@ static void rtl92s_init_aspm_vars(struct ieee80211_hw *hw) 
static void rtl92se_fw_cb(const struct firmware *firmware, void *context)

{

	struct ieee80211_hw *hw = context;

	struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	struct rtl_pci *rtlpci = rtl_pcidev(pcipriv);

	struct rt_firmware *pfirmware = NULL;

	int err;



	RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,

			 "Firmware callback routine entered!\n");
@@ -112,20 +109,6 @@ static void rtl92se_fw_cb(const struct firmware *firmware, void *context) 
	memcpy(pfirmware->sz_fw_tmpbuffer, firmware->data, firmware->size);

	pfirmware->sz_fw_tmpbufferlen = firmware->size;

	release_firmware(firmware);



	err = ieee80211_register_hw(hw);

	if (err) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,

			 "Can't register mac80211 hw\n");

		return;

	} else {

		rtlpriv->mac80211.mac80211_registered = 1;

	}

	rtlpci->irq_alloc = 1;

	set_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status);



	/*init rfkill */

	rtl_init_rfkill(hw);

}



static int rtl92s_init_sw_vars(struct ieee80211_hw *hw)