From ee4fe0b0055986ab5bcbb210dab9754722a54b72 Mon Sep 17 00:00:00 2001
From: Arend van Spriel <arend@broadcom.com>
Date: Tue, 23 Aug 2011 14:13:57 +0200
Subject: [PATCH] --- yaml --- r: 267503 b: refs/heads/master c:
 183eeb985a2cdbf37c7850c5e8e99cc1cc26901f h: refs/heads/master i:   267501:
 e805d9f6a13ec61d730c33c43485c9e190ee2a8a   267499:
 099586d5624349039a0fe05892d8bf9f6ae14c9c   267495:
 59bc0915593b548902a450397f1d736ec4dadfa4   267487:
 79623d4ccbb43a96b0cc90c4a030454af2d8156c v: v3

---
 [refs]                                                 | 2 +-
 trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 99de341c142a..444007a327ea 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60be7ec5099cee40f40b0fbb75ea4396016a5231
+refs/heads/master: 183eeb985a2cdbf37c7850c5e8e99cc1cc26901f
diff --git a/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c b/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
index 6c604cf627d5..80bb30a8a762 100644
--- a/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/trunk/drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
@@ -3189,7 +3189,14 @@ static void brcmf_term_iscan(struct brcmf_cfg80211_priv *cfg_priv)
 	if (cfg_priv->iscan_on && iscan->tsk) {
 		iscan->state = WL_ISCAN_STATE_IDLE;
 		send_sig(SIGTERM, iscan->tsk, 1);
+
+		/*
+		 * The iscan task may want to acquire the rtnl_lock
+		 * so release it here upon stopping the task.
+		 */
+		rtnl_unlock();
 		kthread_stop(iscan->tsk);
+		rtnl_lock();
 		iscan->tsk = NULL;
 
 		/* Abort iscan running in FW */