From fab699e31c90b8fc5fa0a0a6503ae42c02ef555b Mon Sep 17 00:00:00 2001 From: Arend van Spriel Date: Wed, 17 Apr 2013 21:25:55 +0200 Subject: [PATCH] --- yaml --- r: 369631 b: refs/heads/master c: 6d421e54c2277990f3b0e3dd92e446800c90efa3 h: refs/heads/master i: 369629: b075992a554b8172a59072dbe4a08aa75156ae48 369627: fcdc6581fa755e438628d3168dadf2fbe62e7abe 369623: 221273e05399f807bf4669573350753a6aa7cdad 369615: 291885a408dd258306a09565b57cbcd1116c3dba 369599: 960a7df84cfea56ea900ba3a532545b04e324a30 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7ca6b78d0771..3564b8801f56 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5e9d805f907bb910fe3d10a721c24f6a4ee8237 +refs/heads/master: 6d421e54c2277990f3b0e3dd92e446800c90efa3 diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c index 648f9bd89dac..1cfec5601c68 100644 --- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c +++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c @@ -1821,14 +1821,17 @@ void brcmf_fws_add_interface(struct brcmf_if *ifp) void brcmf_fws_del_interface(struct brcmf_if *ifp) { struct brcmf_fws_mac_descriptor *entry = ifp->fws_desc; + ulong flags; brcmf_dbg(TRACE, "enter: idx=%d\n", ifp->bssidx); if (!entry) return; + brcmf_fws_lock(ifp->drvr, flags); ifp->fws_desc = NULL; brcmf_fws_clear_mac_descriptor(entry); brcmf_fws_cleanup(ifp->drvr->fws, ifp->ifidx); + brcmf_fws_unlock(ifp->drvr, flags); } static void brcmf_fws_dequeue_worker(struct work_struct *worker)