diff options
| author | Michael Büsch <mb@bu3sch.de> | 2011-11-16 22:45:23 +0000 |
|---|---|---|
| committer | Michael Büsch <mb@bu3sch.de> | 2011-11-16 22:45:23 +0000 |
| commit | e12543a1d7035bd90b7b3ac19e12f63c6423ecdb (patch) | |
| tree | 83cb3542350602b29d36262c38bf7785c00138c0 /package/mac80211 | |
| parent | 06c986984eb85bb8c6b936cdb0df208757341bb9 (diff) | |
| download | upstream-e12543a1d7035bd90b7b3ac19e12f63c6423ecdb.tar.gz upstream-e12543a1d7035bd90b7b3ac19e12f63c6423ecdb.tar.bz2 upstream-e12543a1d7035bd90b7b3ac19e12f63c6423ecdb.zip | |
p54spi: workqueue deadlock fix
SVN-Revision: 29202
Diffstat (limited to 'package/mac80211')
| -rw-r--r-- | package/mac80211/patches/852-p54spi-cancel-workqueue-fix.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/package/mac80211/patches/852-p54spi-cancel-workqueue-fix.patch b/package/mac80211/patches/852-p54spi-cancel-workqueue-fix.patch new file mode 100644 index 0000000000..c5302931e0 --- /dev/null +++ b/package/mac80211/patches/852-p54spi-cancel-workqueue-fix.patch @@ -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) |