---

yaml --- r: 150400 b: refs/heads/master c: 4de2dc7 h: refs/heads/master v: v3
git-mirror · May 20, 2009 · fd5b850 · fd5b850
1 parent 18e263d
commit fd5b850
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f0d843b5c94be824c2027f01348f360958e5542
+refs/heads/master: 4de2dc74a1c7dedcfbe8290316f1a239a7c86554
diff --git a/trunk/drivers/net/wireless/p54/p54spi.c b/trunk/drivers/net/wireless/p54/p54spi.c
@@ -525,8 +525,7 @@ static void p54spi_work(struct work_struct *work)
 
 	mutex_lock(&priv->mutex);
 
-	if (priv->fw_state == FW_STATE_OFF &&
-	    priv->fw_state == FW_STATE_RESET)
+	if (priv->fw_state == FW_STATE_OFF)
 		goto out;
 
 	ints = p54spi_read32(priv, SPI_ADRS_HOST_INTERRUPTS);