ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-20 06:08:08 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

p54spi: Lock fixes

Browse Source 
SVN-Revision: 29200
This commit is contained in:
Michael Büsch 2011-11-16 22:26:12 +00:00
parent 0f03e17bd0
commit 6aac54298b
2 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package/mac80211/patches/850-p54spi-lock-fix.patch Normal file
View File

@ -0,0 +1,12 @@
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-05 20:30:04.000000000 +0100
+++ compat-wireless-2011-11-04/drivers/net/wireless/p54/p54spi.c 2011-11-16 22:12:03.648829886 +0100
@@ -656,6 +656,7 @@ static int __devinit p54spi_probe(struct
init_completion(&priv->fw_comp);
INIT_LIST_HEAD(&priv->tx_pending);
mutex_init(&priv->mutex);
+ spin_lock_init(&priv->tx_lock);
SET_IEEE80211_DEV(hw, &spi->dev);
priv->common.open = p54spi_op_start;
priv->common.stop = p54spi_op_stop;

17
package/mac80211/patches/851-p54spi-mutex-fix.patch Normal file
View File

@ -0,0 +1,17 @@
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 22:12:03.648829886 +0100
+++ compat-wireless-2011-11-04/drivers/net/wireless/p54/p54spi.c 2011-11-16 22:15:28.931976935 +0100
@@ -581,11 +581,7 @@ static void p54spi_op_stop(struct ieee80
struct p54s_priv *priv = dev->priv;
unsigned long flags;
- if (mutex_lock_interruptible(&priv->mutex)) {
- /* FIXME: how to handle this error? */
- return;
- }
-
+ mutex_lock(&priv->mutex);
WARN_ON(priv->fw_state != FW_STATE_READY);
cancel_work_sync(&priv->work);