summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarsten Wiese <fzuuzf@googlemail.com>2014-10-22 15:47:33 +0200
committerJohn W. Linville <linville@tuxdriver.com>2014-10-23 14:02:07 -0400
commitcefe3dfdb9f5f498cae9871f7e52800f5e22c614 (patch)
treea98722626da5fab9a243077d8cca0e5298db3ee4
parentb2d624a5810203a1a8b7735e1ec5685109b22fc3 (diff)
downloadblackbird-op-linux-cefe3dfdb9f5f498cae9871f7e52800f5e22c614.tar.gz
blackbird-op-linux-cefe3dfdb9f5f498cae9871f7e52800f5e22c614.zip
rtl8192cu: Call ieee80211_register_hw from rtl_usb_probe
In a previous patch the call to ieee80211_register_hw was moved from the load firmware callback to the rtl_pci_probe only. rt8192cu also uses this callback. Currently it doesnt create a wlan%d device. Fill in the call to ieee80211_register_hw in rtl_usb_probe. Signed-off-by: Karsten Wiese <fzuuzf@googlemail.com> Acked-by: Larry Finger <Larry.Finger@lwfinger.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/rtlwifi/usb.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/net/wireless/rtlwifi/usb.c b/drivers/net/wireless/rtlwifi/usb.c
index 10cf69c4bc42..46ee956d0235 100644
--- a/drivers/net/wireless/rtlwifi/usb.c
+++ b/drivers/net/wireless/rtlwifi/usb.c
@@ -1117,7 +1117,18 @@ int rtl_usb_probe(struct usb_interface *intf,
}
rtlpriv->cfg->ops->init_sw_leds(hw);
+ err = ieee80211_register_hw(hw);
+ if (err) {
+ RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
+ "Can't register mac80211 hw.\n");
+ err = -ENODEV;
+ goto error_out;
+ }
+ rtlpriv->mac80211.mac80211_registered = 1;
+
+ set_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status);
return 0;
+
error_out:
rtl_deinit_core(hw);
_rtl_usb_io_handler_release(hw);
OpenPOWER on IntegriCloud