4 files changed, 21 insertions, 7 deletions

diff --git a/drivers/net/wireless/b43/dma.c b/drivers/net/wireless/b43/dma.c
index 8a9776b52daf..70db0570adc5 100644
--- a/drivers/net/wireless/b43/dma.c
+++ b/drivers/net/wireless/b43/dma.c
@@ -574,6 +574,7 @@ static int setup_rx_descbuffer(struct b43_dmaring *ring,
         }
 
         if (b43_dma_mapping_error(ring, dmaaddr, ring->rx_buffersize, 0)) {
+                b43err(ring->dev->wl, "RX DMA buffer allocation failed\n");
                 dev_kfree_skb_any(skb);
                 return -EIO;
         }
@@ -829,8 +830,12 @@ struct b43_dmaring *b43_setup_dmaring(struct b43_wldev *dev,
                                                   DMA_TO_DEVICE);
 
                         if (b43_dma_mapping_error(ring, dma_test,
-                                                  b43_txhdr_size(dev), 1))
+                                                  b43_txhdr_size(dev), 1)) {
+
+                                b43err(dev->wl,
+                                       "TXHDR DMA allocation failed\n");
                                 goto err_kfree_txhdr_cache;
+                        }
                 }
 
                 dma_unmap_single(dev->dev->dev,
diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c
index b79a6bd5396d..371e4a119511 100644
--- a/drivers/net/wireless/b43/pcmcia.c
+++ b/drivers/net/wireless/b43/pcmcia.c
@@ -91,6 +91,8 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
 
         dev->conf.ConfigBase = parse.config.base;
         dev->conf.Present = parse.config.rmask[0];
+        dev->conf.Attributes = CONF_ENABLE_IRQ;
+        dev->conf.IntType = INT_MEMORY_AND_IO;
 
         dev->io.BasePort2 = 0;
         dev->io.NumPorts2 = 0;
@@ -112,8 +114,8 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
         if (res != CS_SUCCESS)
                 goto err_disable;
 
-        dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING | IRQ_FIRST_SHARED;
-        dev->irq.IRQInfo1 = IRQ_LEVEL_ID | IRQ_SHARE_ID;
+        dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
+        dev->irq.IRQInfo1 = IRQ_LEVEL_ID;
         dev->irq.Handler = NULL; /* The handler is registered later. */
         dev->irq.Instance = NULL;
         res = pcmcia_request_irq(dev, &dev->irq);
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c
index d17746582160..53afebac7146 100644
--- a/drivers/net/wireless/libertas/if_cs.c
+++ b/drivers/net/wireless/libertas/if_cs.c
@@ -677,9 +677,7 @@ sbi_get_int_status_exit:
 
         /* Card has a command result for us */
         if (*ireg & IF_CS_C_S_CMD_UPLD_RDY) {
-                spin_lock(&priv->driver_lock);
                 ret = if_cs_receive_cmdres(priv, priv->upld_buf, &priv->upld_len);
-                spin_unlock(&priv->driver_lock);
                 if (ret < 0)
                         lbs_pr_err("could not receive cmd from card\n");
         }
diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 62b58a6261fe..50ea7bd0c922 100644
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -1252,11 +1252,20 @@ int rt2x00lib_suspend(struct rt2x00_dev *rt2x00dev, pm_message_t state)
 
 exit:
         /*
-         * Set device mode to sleep for power management.
+         * Set device mode to sleep for power management,
+         * on some hardware this call seems to consistently fail.
+         * From the specifications it is hard to tell why it fails,
+         * and if this is a "bad thing".
+         * Overall it is safe to just ignore the failure and
+         * continue suspending. The only downside is that the
+         * device will not be in optimal power save mode, but with
+         * the radio and the other components already disabled the
+         * device is as good as disabled.
          */
         retval = rt2x00dev->ops->lib->set_device_state(rt2x00dev, STATE_SLEEP);
         if (retval)
-                return retval;
+                WARNING(rt2x00dev, "Device failed to enter sleep state, "
+                        "continue suspending.\n");
 
         return 0;
 }