Skip to content

Commit

Permalink
brcm80211: fmac: make sure cancel_work_sync only called after INIT_WORK
Browse files Browse the repository at this point in the history
INIT_WORK only gets called after brcmf_proto_attach returns
success. This dependency should be annotated in brcmf_detach to
avoid any error.

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Franky Lin authored and John W. Linville committed Feb 22, 2012
1 parent 2315992 commit 89fdb46
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -1109,13 +1109,13 @@ void brcmf_detach(struct device *dev)
if (drvr->iflist[i])
brcmf_del_if(drvr, i);

cancel_work_sync(&drvr->setmacaddr_work);
cancel_work_sync(&drvr->multicast_work);

brcmf_bus_detach(drvr);

if (drvr->prot)
if (drvr->prot) {
cancel_work_sync(&drvr->setmacaddr_work);
cancel_work_sync(&drvr->multicast_work);
brcmf_proto_detach(drvr);
}

bus_if->drvr = NULL;
kfree(drvr);
Expand Down

0 comments on commit 89fdb46

Please sign in to comment.