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 | 86bee92665f3aae177df0bf95e18e6bdb2abc1be (patch) | |
| tree | b2b22d938289a2f00e620ecc749babd37ffaf3bc /package/mac80211/patches/852-p54spi-cancel-workqueue-fix.patch | |
| parent | 46a5094e4e12d607754b2943fdefa58037205db1 (diff) | |
| download | upstream-86bee92665f3aae177df0bf95e18e6bdb2abc1be.tar.gz upstream-86bee92665f3aae177df0bf95e18e6bdb2abc1be.tar.bz2 upstream-86bee92665f3aae177df0bf95e18e6bdb2abc1be.zip | |
p54spi: workqueue deadlock fix
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29202 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/852-p54spi-cancel-workqueue-fix.patch')
| -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) |