mac80211: backport from trunk

[openwrt-10.03/.git] / package / mac80211 / patches / 851-p54spi-mutex-fix.patch

diff --git a/package/mac80211/patches/851-p54spi-mutex-fix.patch b/package/mac80211/patches/851-p54spi-mutex-fix.patch
deleted file mode 100644 (file)
index e974e9d..0000000
--- a/package/mac80211/patches/851-p54spi-mutex-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/drivers/net/wireless/p54/p54spi.c
-+++ b/drivers/net/wireless/p54/p54spi.c
-@@ -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);