From 2afdca8bd96ffbf5c39e8b1dd430628cb0171567 Mon Sep 17 00:00:00 2001
From: Franky Lin <frankyl@broadcom.com>
Date: Thu, 9 Feb 2012 21:09:01 +0100
Subject: [PATCH] --- yaml --- r: 290617 b: refs/heads/master c:
 89fdb468e201c16b31d3337b68993bc9f763a5a0 h: refs/heads/master i:   290615:
 ab3cb2042579dbcffaafcda46df076462acdd97a v: v3

---
 [refs]                                                    | 2 +-
 trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 6e4ee4958953..b573fe388af6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2315992c2a6f395dd3dfd4ba50a164d5f3ded84d
+refs/heads/master: 89fdb468e201c16b31d3337b68993bc9f763a5a0
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index db2df1f1e6b2..eff0073879c7 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -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);