---

yaml --- r: 214659 b: refs/heads/master c: 74d81b2 h: refs/heads/master i: 214657: f1c8130 214655: 54088f2 v: v3
git-mirror · Sep 14, 2010 · 6347431 · 6347431
1 parent dd116d7
commit 6347431
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 17 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: edeb78a7fa838b7fb9c2043680bd8da7cb5cb0e5
+refs/heads/master: 74d81b259d6c8493f066e34c939cb6fb7d3129e5
diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c b/trunk/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -361,7 +361,7 @@ static int __must_check iwl_scan_initiate(struct iwl_priv *priv,
 
 	cancel_delayed_work(&priv->scan_check);
 
-	if (!iwl_is_ready(priv)) {
+	if (!iwl_is_ready_rf(priv)) {
 		IWL_WARN(priv, "request scan called when driver not ready.\n");
 		return -EIO;
 	}
@@ -372,26 +372,11 @@ static int __must_check iwl_scan_initiate(struct iwl_priv *priv,
 		return -EBUSY;
 	}
 
-	if (test_bit(STATUS_EXIT_PENDING, &priv->status)) {
-		IWL_DEBUG_SCAN(priv, "Aborting scan due to device shutdown\n");
-		return -EIO;
-	}
-
 	if (test_bit(STATUS_SCAN_ABORTING, &priv->status)) {
 		IWL_DEBUG_HC(priv, "Scan request while abort pending.\n");
 		return -EBUSY;
 	}
 
-	if (iwl_is_rfkill(priv)) {
-		IWL_DEBUG_HC(priv, "Aborting scan due to RF Kill activation\n");
-		return -EIO;
-	}
-
-	if (!test_bit(STATUS_READY, &priv->status)) {
-		IWL_DEBUG_HC(priv, "Scan request while uninitialized.\n");
-		return -EBUSY;
-	}
-
 	IWL_DEBUG_INFO(priv, "Starting %sscan...\n",
 			internal ? "internal short " : "");