---

yaml --- r: 267503 b: refs/heads/master c: 183eeb9 h: refs/heads/master i: 267501: e805d9f 267499: 099586d 267495: 59bc091 267487: 79623d4 v: v3
git-mirror · Aug 23, 2011 · ee4fe0b · ee4fe0b
1 parent d0810c1
commit ee4fe0b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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 */