---

yaml --- r: 102948 b: refs/heads/master c: 808e72a h: refs/heads/master v: v3
git-mirror · Jun 14, 2008 · b6fbed2 · b6fbed2
1 parent 33bb128
commit b6fbed2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 95483b69c8c0d49e43c97ecb5eb3cbec48a02d61
+refs/heads/master: 808e72a088d164cf0030f593d9a5fc23306fb6b6
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -2875,7 +2875,8 @@ static void iwl3945_radio_kill_sw(struct iwl3945_priv *priv, int disable_radio)
 		return;
 	}
 
-	queue_work(priv->workqueue, &priv->restart);
+	if (priv->is_open)
+		queue_work(priv->workqueue, &priv->restart);
 	return;
 }
 

diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c b/trunk/drivers/net/wireless/iwlwifi/iwl4965-base.c
@@ -970,7 +970,8 @@ int iwl4965_radio_kill_sw(struct iwl_priv *priv, int disable_radio)
 		return 0;
 	}
 
-	queue_work(priv->workqueue, &priv->restart);
+	if (priv->is_open)
+		queue_work(priv->workqueue, &priv->restart);
 	return 1;
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     		return;
     	}
-    	queue_work(priv->workqueue, &priv->restart);
+    	if (priv->is_open)
+    		queue_work(priv->workqueue, &priv->restart);
     	return;
     }
@@ Expand Down @@