From fd5b8504127af605ce9e6cfbaec63404e092c7c8 Mon Sep 17 00:00:00 2001 From: Max Filippov Date: Mon, 18 May 2009 21:28:55 +0400 Subject: [PATCH] --- yaml --- r: 150400 b: refs/heads/master c: 4de2dc74a1c7dedcfbe8290316f1a239a7c86554 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/p54/p54spi.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f72920eefd0d..9f54c31711d3 100644 --- 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 index 40aeb4387dc9..83116baeb110 100644 --- 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);