diff options
author | Felix Fietkau <nbd@openwrt.org> | 2011-12-05 14:20:17 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2011-12-05 14:20:17 +0000 |
commit | a95157c262a1c1c75151bbda240f7c107c6a9a53 (patch) | |
tree | cc7314ba8bd7c186ce1ad1b7296964fc39c79417 /package/mac80211/patches/852-p54spi-cancel-workqueue-fix.patch | |
parent | a86d2fb99b8aad2846a992c8bc08227516a7e87e (diff) | |
download | master-187ad058-a95157c262a1c1c75151bbda240f7c107c6a9a53.tar.gz master-187ad058-a95157c262a1c1c75151bbda240f7c107c6a9a53.tar.bz2 master-187ad058-a95157c262a1c1c75151bbda240f7c107c6a9a53.zip |
mac80211: update to 2011-12-01
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29436 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 | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/package/mac80211/patches/852-p54spi-cancel-workqueue-fix.patch b/package/mac80211/patches/852-p54spi-cancel-workqueue-fix.patch deleted file mode 100644 index f8d36ca049..0000000000 --- a/package/mac80211/patches/852-p54spi-cancel-workqueue-fix.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/drivers/net/wireless/p54/p54spi.c -+++ b/drivers/net/wireless/p54/p54spi.c -@@ -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) |