Commit d1497f21 authored Apr 25, 2013 by Piotr Haber Committed by John W. Linville Apr 26, 2013

brcmsmac: Fix merge issue

Commit 7088f4835aa353f7226e57e73fd9e6564a4dfb75
"Merge branch 'master' of
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

"
ramoved call to brcms_led_unregister in mac80211_if.c

Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Piotr Haber <phaber@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 00b38ab3

drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -336,6 +336,7 @@ static void brcms_remove(struct bcma_device *pdev)
		struct brcms_info *wl = hw->priv;

		if (wl->wlc) {
		brcms_led_unregister(wl);
		wiphy_rfkill_set_hw_state(wl->pub->ieee_hw->wiphy, false);
		wiphy_rfkill_stop_polling(wl->pub->ieee_hw->wiphy);
		ieee80211_unregister_hw(hw);