2011-11-20 09:29:34 +00:00
|
|
|
--- a/drivers/net/wireless/p54/p54spi.c
|
|
|
|
|
+++ b/drivers/net/wireless/p54/p54spi.c
|
2011-11-16 22:45:23 +00:00
|
|
|
@@ -584,8 +584,6 @@ static void p54spi_op_stop(struct ieee80
|
|
|
|
|
mutex_lock(&priv->mutex);
|
|
|
|
|
WARN_ON(priv->fw_state != FW_STATE_READY);
|
|
|
|
|
|
|
|
|
|
- cancel_work_sync(&priv->work);
|
|
|
|
|
-
|
|
|
|
|
p54spi_power_off(priv);
|
|
|
|
|
spin_lock_irqsave(&priv->tx_lock, flags);
|
|
|
|
|
INIT_LIST_HEAD(&priv->tx_pending);
|
|
|
|
|
@@ -593,6 +591,8 @@ static void p54spi_op_stop(struct ieee80
|
|
|
|
|
|
|
|
|
|
priv->fw_state = FW_STATE_OFF;
|
|
|
|
|
mutex_unlock(&priv->mutex);
|
|
|
|
|
+
|
|
|
|
|
+ cancel_work_sync(&priv->work);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int __devinit p54spi_probe(struct spi_device *spi)
|
