From 414d0e6db0a44f811ac9f51f31407083e7ff7e6b Mon Sep 17 00:00:00 2001 From: Hante Meuleman Date: Wed, 14 Nov 2012 18:46:13 -0800 Subject: [PATCH] --- yaml --- r: 341483 b: refs/heads/master c: df19e777e0587004bb926c73c7188e0d63f19372 h: refs/heads/master i: 341481: 1a6e7f27425740da5aef603f46ece1f58a089bd3 341479: 34764d60254f02092004b10a832b92f54a1dd3cb v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/brcm80211/brcmfmac/fweh.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index eff78f0d8340..9c84fc550e80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b63cb71f1e6b74a6f68a9c7b10d823fd9914d0a +refs/heads/master: df19e777e0587004bb926c73c7188e0d63f19372 diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/fweh.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/fweh.c index e1521afe6522..283acee1798b 100644 --- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/fweh.c +++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/fweh.c @@ -374,11 +374,13 @@ void brcmf_fweh_detach(struct brcmf_pub *drvr) struct brcmf_if *ifp = drvr->iflist[0]; s8 eventmask[BRCMF_EVENTING_MASK_LEN]; - /* clear all events */ - memset(eventmask, 0, BRCMF_EVENTING_MASK_LEN); - (void)brcmf_fil_iovar_data_set(ifp, "event_msgs", - eventmask, BRCMF_EVENTING_MASK_LEN); - + if (ifp) { + /* clear all events */ + memset(eventmask, 0, BRCMF_EVENTING_MASK_LEN); + (void)brcmf_fil_iovar_data_set(ifp, "event_msgs", + eventmask, + BRCMF_EVENTING_MASK_LEN); + } /* cancel the worker */ cancel_work_sync(&fweh->event_work); WARN_ON(!list_empty(&fweh->event_q));