* [PATCH] wireless/p54: fw_state can't be both OFF and RESET
@ 2009-05-18 14:49 Roel Kluin
2009-05-18 17:28 ` [PATCH] p54spi: drop test for FW_STATE_RESET in p54spi_work Max Filippov
0 siblings, 1 reply; 2+ messages in thread
From: Roel Kluin @ 2009-05-18 14:49 UTC (permalink / raw)
To: flamingice; +Cc: linux-wireless, Andrew Morton
fw_state can't be both OFF and RESET
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
This was not tested in any way, so please review.
diff --git a/drivers/net/wireless/p54/p54spi.c b/drivers/net/wireless/p54/p54spi.c
index d1fe577..c327659 100644
--- a/drivers/net/wireless/p54/p54spi.c
+++ b/drivers/net/wireless/p54/p54spi.c
@@ -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;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] p54spi: drop test for FW_STATE_RESET in p54spi_work
2009-05-18 14:49 [PATCH] wireless/p54: fw_state can't be both OFF and RESET Roel Kluin
@ 2009-05-18 17:28 ` Max Filippov
0 siblings, 0 replies; 2+ messages in thread
From: Max Filippov @ 2009-05-18 17:28 UTC (permalink / raw)
To: linux-wireless
Cc: Christian Lamparter, flamingice, Andrew Morton, Max Filippov,
Roel Kluin
Drop test for FW_STATE_RESET in p54spi_work as fw_state
is never assigned this value.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
---
drivers/net/wireless/p54/p54spi.c | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/p54/p54spi.c b/drivers/net/wireless/p54/p54spi.c
index fe90f88..bd75f10 100644
--- a/drivers/net/wireless/p54/p54spi.c
+++ b/drivers/net/wireless/p54/p54spi.c
@@ -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);
--
1.6.0.6
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-05-18 17:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-05-18 14:49 [PATCH] wireless/p54: fw_state can't be both OFF and RESET Roel Kluin
2009-05-18 17:28 ` [PATCH] p54spi: drop test for FW_STATE_RESET in p54spi_work Max Filippov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).