Skip to contentSkip to conversation

wireless/p54: fw_state can't be both OFF and RESET

PATCH New Roel Kluin 2 participants 2 messages May 18, 2009 Networking drivers (wireless)

lore
Share & tools
lore

Roel Kluin

author
#0 lore raw

PATCH 1/1 wireless/p54: fw_state can't be both OFF and RESET

fw_state can't be both OFF and RESET

Signed-off-by Roel Kluin <[email protected]>

---
This was not tested in any way, so please review.

drivers/net/wireless/p54/p54spi.c +1 -1
index d1fe577..c327659 100644
@@ -516,7 +516,7 @@ static void p54spi_work(struct work_struct *work)
 
 	mutex_lock(&priv->mutex);
 
-	if (priv->fw_state == FW_STATE_OFF &&
+	if (priv->fw_state == FW_STATE_OFF ||
 	    priv->fw_state == FW_STATE_RESET)
 		goto out;
#1 lore raw

PATCH 1/1 p54spi: drop test for FW_STATE_RESET in p54spi_work

Drop test for FW_STATE_RESET in p54spi_work as fw_state is never assigned this value.

Signed-off-by Roel Kluin <[email protected]>
Signed-off-by Max Filippov <[email protected]>
---
 drivers/net/wireless/p54/p54spi.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)
drivers/net/wireless/p54/p54spi.c +1 -2
index fe90f88..bd75f10 100644
@@ -511,8 +511,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);
Signature · 1 line
1.6.0.6