summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/brcm80211/brcmfmac
diff options
context:
space:
mode:
authorArend van Spriel <arend@broadcom.com>2014-07-12 08:49:42 +0200
committerJohn W. Linville <linville@tuxdriver.com>2014-07-15 16:00:16 -0400
commitc3da74bbbb8b230ad8bb84ca324c4e07607c9a7f (patch)
treec9d1132418e4302ddbc80afa7d3d9d5c8e789994 /drivers/net/wireless/brcm80211/brcmfmac
parentb48d891676f756d48b4d0ee131e4a7a5d43ca417 (diff)
downloadlinux-c3da74bbbb8b230ad8bb84ca324c4e07607c9a7f.tar.gz
brcmfmac: add brcmf_p2p_detach() call in brcmf_cfg80211_detach()
The function brcmf_p2p_detach() was only called in error flow of the brcmf_cfg80211_attach() routine, but it also needs to be called upon brcmf_cfg80211_detach(). Reviewed-by: Hante Meuleman <meuleman@broadcom.com> Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com> Signed-off-by: Arend van Spriel <arend@broadcom.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/brcm80211/brcmfmac')
-rw-r--r--drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index d3bb4e0f4480..48078a321716 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -5682,6 +5682,7 @@ void brcmf_cfg80211_detach(struct brcmf_cfg80211_info *cfg)
WARN_ON(!list_empty(&cfg->vif_list));
wiphy_unregister(cfg->wiphy);
brcmf_btcoex_detach(cfg);
+ brcmf_p2p_detach(&cfg->p2p);
wl_deinit_priv(cfg);
brcmf_free_wiphy(cfg->wiphy);
}