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: Larry Finger <Larry.Finger@lwfinger.net> Cc: Murilo Opsfelder Araujo <mopsfelder@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
c0386f1584
commit
501479699f
|
@ -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)
|
static void rtl92se_fw_cb(const struct firmware *firmware, void *context)
|
||||||
{
|
{
|
||||||
struct ieee80211_hw *hw = context;
|
struct ieee80211_hw *hw = context;
|
||||||
struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw);
|
|
||||||
struct rtl_priv *rtlpriv = rtl_priv(hw);
|
struct rtl_priv *rtlpriv = rtl_priv(hw);
|
||||||
struct rtl_pci *rtlpci = rtl_pcidev(pcipriv);
|
|
||||||
struct rt_firmware *pfirmware = NULL;
|
struct rt_firmware *pfirmware = NULL;
|
||||||
int err;
|
|
||||||
|
|
||||||
RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
|
RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
|
||||||
"Firmware callback routine entered!\n");
|
"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);
|
memcpy(pfirmware->sz_fw_tmpbuffer, firmware->data, firmware->size);
|
||||||
pfirmware->sz_fw_tmpbufferlen = firmware->size;
|
pfirmware->sz_fw_tmpbufferlen = firmware->size;
|
||||||
release_firmware(firmware);
|
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)
|
static int rtl92s_init_sw_vars(struct ieee80211_hw *hw)
|
||||||
|
|
Loading…
Reference in a new issue