KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

p54spi: workqueue deadlock fix

Browse source 
SVN-Revision: 29202
This commit is contained in:
Michael Büsch 2011-11-16 22:45:23 +00:00
parent 06c986984e
commit e12543a1d7
1 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
package/mac80211/patches/852-p54spi-cancel-workqueue-fix.patch Normal file
View file

@ -0,0 +1,22 @@
Index: compat-wireless-2011-11-04/drivers/net/wireless/p54/p54spi.c
===================================================================
--- compat-wireless-2011-11-04.orig/drivers/net/wireless/p54/p54spi.c 2011-11-16 23:36:01.399952345 +0100
+++ compat-wireless-2011-11-04/drivers/net/wireless/p54/p54spi.c 2011-11-16 23:37:38.799547564 +0100
@@ -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)