---

yaml --- r: 276209 b: refs/heads/master c: 2d16181 h: refs/heads/master i: 276207: fc43b18 v: v3
git-mirror · Nov 17, 2011 · ebc5f95 · ebc5f95
1 parent 0d619c9
commit ebc5f95
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32d3a3922d617a5a685a5e2d24b20d0e88f192a9
+refs/heads/master: 2d1618170eb493d18f66f2ac03775409a6fb97c6
diff --git a/trunk/drivers/net/wireless/p54/p54spi.c b/trunk/drivers/net/wireless/p54/p54spi.c
@@ -588,15 +588,15 @@ static void p54spi_op_stop(struct ieee80211_hw *dev)
 
 	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);
 	spin_unlock_irqrestore(&priv->tx_lock, flags);
 
 	priv->fw_state = FW_STATE_OFF;
 	mutex_unlock(&priv->mutex);
+
+	cancel_work_sync(&priv->work);
 }
 
 static int __devinit p54spi_probe(struct spi_device *spi)