---

yaml --- r: 369151 b: refs/heads/master c: 47829f4 h: refs/heads/master i: 369149: e4e7713 369147: 19d9f4c 369143: e7aba41 369135: 98634a6 369119: cf69cac 369087: 9a10780 369023: 614ac52 368895: b0fe80f 368639: ff4a465 v: v3
git-mirror · Apr 3, 2013 · c277d6e · c277d6e
1 parent eede276
commit c277d6e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9337414e87259fae13693796f7ad897b1b7f8e1
+refs/heads/master: 47829f4fc4825ad3a50389a682a6ea954664ba79
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -982,8 +982,7 @@ void brcmf_detach(struct device *dev)
 	if (drvr->prot)
 		brcmf_proto_detach(drvr);
 
-	if (drvr->fws)
-		brcmf_fws_deinit(drvr);
+	brcmf_fws_deinit(drvr);
 
 	brcmf_debugfs_detach(drvr);
 	bus_if->drvr = NULL;

diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/fwsignal.c
@@ -1224,11 +1224,12 @@ int brcmf_fws_init(struct brcmf_pub *drvr)
 	u32 tlv = 0;
 	int rc;
 
-	/* enable rssi signals */
-	if (drvr->fw_signals)
-		tlv = BRCMF_FWS_FLAGS_RSSI_SIGNALS |
-		      BRCMF_FWS_FLAGS_XONXOFF_SIGNALS |
-		      BRCMF_FWS_FLAGS_CREDIT_STATUS_SIGNALS;
+	if (!drvr->fw_signals)
+		return 0;
+
+	tlv = BRCMF_FWS_FLAGS_RSSI_SIGNALS |
+	      BRCMF_FWS_FLAGS_XONXOFF_SIGNALS |
+	      BRCMF_FWS_FLAGS_CREDIT_STATUS_SIGNALS;
 
 	spin_lock_init(&drvr->fws_spinlock);
 
@@ -1277,6 +1278,9 @@ void brcmf_fws_deinit(struct brcmf_pub *drvr)
 	struct brcmf_fws_info *fws = drvr->fws;
 	ulong flags;
 
+	if (!fws)
+		return;
+
 	/* cleanup */
 	brcmf_fws_lock(drvr, flags);
 	brcmf_fws_cleanup(fws, -1);